diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index b61406f..2a3bd70 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -7,19 +7,6 @@ on: branches: [ dev, ci/** ] jobs: - # docs: - # runs-on: ubuntu-latest - # steps: - # - uses: flucoma/actions/env@v4 - # - uses: flucoma/actions/docs@v4 - # with: - # target: MAKE_SC_REF - # - # - uses: actions/upload-artifact@v2 - # with: - # name: docs - # path: build/sc_ref - macbuild: runs-on: macos-11 steps: @@ -83,51 +70,17 @@ jobs: needs: [macbuild, winbuild, linuxbuild] steps: - # - uses: actions/download-artifact@v2 - # with: - # name: docs - # path: docs - - uses: actions/download-artifact@v2 with: - name: macbuild - # path: mac + name: macbuild - # - name: copy docs to mac - # run: mkdir -p mac/FluidCorpusManipulation/HelpSource && cp -r docs/* mac/FluidCorpusManipulation/HelpSource - # - # - # - name: compress win - # run: zip -r ../FluCoMa-SC-Mac-nightly.zip . - # working-directory: mac - - - uses: actions/download-artifact@v2 with: - name: winbuild - # path: win - # - # - name: copy docs to win - # run: mkdir -p win/FluidCorpusManipulation/HelpSource && cp -r docs/* win/FluidCorpusManipulation/HelpSource - # - # - name: compress win - # run: zip -r ../FluCoMa-SC-Windows-nightly.zip . - # working-directory: win - + name: winbuild - uses: actions/download-artifact@v2 with: - name: linuxbuild - - # path: linux - - # - name: copy docs to linux - # run: mkdir -p linux/FluidCorpusManipulation/HelpSource && cp -r docs/* linux/FluidCorpusManipulation/HelpSource - # - # - name: compress linux - # run: zip -r ../FluCoMa-SC-Linux-nightly.zip . - # working-directory: linux - + name: linuxbuild - uses: dev-drprasad/delete-tag-and-release@v0.2.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 545fb91..decf7a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,60 +2,46 @@ name: Release on: workflow_dispatch: - inputs: - base: - description: 'Base branch to deploy core from' - required: false - default: 'main' jobs: - docs: - runs-on: ubuntu-latest - steps: - - uses: flucoma/actions/env@v4 - with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/docs@v4 - with: - target: MAKE_SC_REF - branch: ${{ github.event.inputs.base }} - - - uses: actions/upload-artifact@v2 - with: - name: docs - path: build/sc_ref - macbuild: runs-on: macos-11 steps: - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v4 + - uses: flucoma/actions/env@v5 + - uses: flucoma/actions/sc@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/sc@v4 + branch: origin/main + + - name: compress archive + run: zip -r FluCoMa-SC-Mac-nightly.zip FluidCorpusManipulation + working-directory: install - uses: actions/upload-artifact@v2 - with: - name: macbuild - path: install + with: + name: macbuild + path: install/FluCoMa-SC-Mac-nightly.zip winbuild: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v4 + - uses: flucoma/actions/env@v5 + - uses: flucoma/actions/sc@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/sc@v4 + branch: origin/main - name: remove pdb files run: Remove-Item install -Recurse -Include *.pdb - - uses: actions/upload-artifact@v2 + - name: compress archive + run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation + working-directory: install + - uses: actions/upload-artifact@v2 with: name: winbuild - path: install + path: install/FluCoMa-SC-Windows-nightly.zip linuxbuild: runs-on: ubuntu-18.04 @@ -63,15 +49,19 @@ jobs: version: ${{ steps.get-version.outputs.version }} steps: - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v4 + - uses: flucoma/actions/env@v5 + - uses: flucoma/actions/sc@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/sc@v4 + branch: origin/main + + - name: compress archive + run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation + working-directory: install - - uses: actions/upload-artifact@v2 - with: - name: linuxbuild - path: install + - uses: actions/upload-artifact@v2 + with: + name: linuxbuild + path: install/FluCoMa-SC-Linux-nightly.tar.gz - id: get-version run: echo "::set-output name=version::$(cat flucoma.version.rc)" @@ -79,51 +69,21 @@ jobs: release: runs-on: ubuntu-latest - needs: [macbuild, winbuild, linuxbuild, docs] + needs: [macbuild, winbuild, linuxbuild] - steps: - - uses: actions/download-artifact@v2 - with: - name: docs - path: docs - + steps: - uses: actions/download-artifact@v2 with: name: macbuild - path: mac - - - name: copy docs to mac - run: mkdir -p mac/FluidCorpusManipulation/HelpSource && cp -r docs/* mac/FluidCorpusManipulation/HelpSource - - - name: compress win - run: zip -r ../FluCoMa-SC-Mac.zip . - working-directory: mac - uses: actions/download-artifact@v2 with: name: winbuild - path: win - - - name: copy docs to win - run: mkdir -p win/FluidCorpusManipulation/HelpSource && cp -r docs/* win/FluidCorpusManipulation/HelpSource - - - name: compress win - run: zip -r ../FluCoMa-SC-Windows.zip . - working-directory: win - uses: actions/download-artifact@v2 with: name: linuxbuild - path: linux - - - name: copy docs to linux - run: mkdir -p linux/FluidCorpusManipulation/HelpSource && cp -r docs/* linux/FluidCorpusManipulation/HelpSource - - - name: compress linux - run: zip -r ../FluCoMa-SC-Linux.zip . - working-directory: linux - - name: package and upload uses: softprops/action-gh-release@v1 with: