diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yml similarity index 69% rename from .github/workflows/nightly.yaml rename to .github/workflows/nightly.yml index 4165574..615b682 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yml @@ -6,19 +6,6 @@ on: branches: [ dev, ci/** ] jobs: - # docs: - # runs-on: ubuntu-latest - # steps: - # - uses: flucoma/actions/env@v5 - # - uses: flucoma/actions/docs@v5 - # with: - # target: MAKE_PD_REF - # - # - uses: actions/upload-artifact@v2 - # with: - # name: docs - # path: build/pd_ref - macbuild: runs-on: macos-11 steps: @@ -78,50 +65,22 @@ jobs: needs: [macbuild, winbuild, linuxbuild] steps: - # - uses: actions/download-artifact@v2 - # with: - # name: docs - # path: docs #### LINUX #### - uses: actions/download-artifact@v2 with: name: linuxbuild - # path: linux - - # - name: copy docs to linux - # run: cp -r docs linux/FluidCorpusManipulation - # - # - name: compress linux - # run: zip -r ../FluCoMa-PD-Linux-nightly.zip . - # working-directory: linux #### MAC #### - uses: actions/download-artifact@v2 with: name: macbuild - # path: mac - # - # - name: copy docs to mac - # run: cp -r docs mac/FluidCorpusManipulation - # - # - name: compress mac - # run: zip -r ../FluCoMa-PD-Mac-nightly.zip . - # working-directory: mac #### WINDOWS #### - uses: actions/download-artifact@v2 with: name: winbuild - # path: win - - # - name: copy docs to windows - # run: cp -r docs win/FluidCorpusManipulation - # - # - name: compress windows - # run: zip -r ../FluCoMa-PD-Windows-nightly.zip . - # working-directory: win - # + #### UPLOAD RELEASE #### - uses: dev-drprasad/delete-tag-and-release@v0.2.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5b2b54..3855130 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,56 +1,43 @@ 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_PD_REF - branch: ${{ github.event.inputs.base }} - - - uses: actions/upload-artifact@v2 - with: - name: docs - path: build/pd_ref - macbuild: runs-on: macos-11 steps: - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v4 + - uses: flucoma/actions/env@v5 + - uses: flucoma/actions/pd@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/pd@v4 + branch: origin/dev - - uses: actions/upload-artifact@v2 - with: - name: macbuild - path: release-packaging + - name: compress archive + run: zip -r FluCoMa-PD-Mac-nightly.zip FluidCorpusManipulation + working-directory: release-packaging + + - uses: actions/upload-artifact@v2 + with: + name: macbuild + path: release-packaging/FluCoMa-PD-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/pd@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/pd@v4 + branch: origin/dev - - uses: actions/upload-artifact@v2 - with: - name: winbuild - path: "release-packaging" + - name: compress archive + run: 7z a FluCoMa-PD-Windows-nightly.zip FluidCorpusManipulation + working-directory: release-packaging + + - uses: actions/upload-artifact@v2 + with: + name: winbuild + path: release-packaging/FluCoMa-PD-Windows-nightly.zip linuxbuild: runs-on: ubuntu-18.04 @@ -58,15 +45,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/pd@v5 with: - branch: ${{ github.event.inputs.base }} - - uses: flucoma/actions/pd@v4 + branch: origin/main + + - name: compress archive + run: tar -zcvf FluCoMa-PD-Linux-nightly.tar.gz FluidCorpusManipulation + working-directory: release-packaging - - uses: actions/upload-artifact@v2 - with: - name: linuxbuild - path: release-packaging + - uses: actions/upload-artifact@v2 + with: + name: linuxbuild + path: release-packaging/FluCoMa-PD-Linux-nightly.tar.gz - id: get-version run: echo "::set-output name=version::$(cat flucoma.version.rc)"