diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 618e5f5..ea7db6e 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -1,17 +1,21 @@ -name: Nightly Releases +name: nightly on: - push: - branches: [ dev, ci/** ] workflow_dispatch: + push: + branches: [ dev ] + +concurrency: + group: environment-${{ github.ref }} + cancel-in-progress: true jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/dev @@ -19,35 +23,45 @@ jobs: run: 7z a FluCoMa-CLI-Windows-nightly.zip FluidCorpusManipulation working-directory: release-packaging - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: winbuild path: release-packaging/FluCoMa-CLI-Windows-nightly.zip macos: - runs-on: macos-11 + runs-on: macos-latest steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/dev - - name: compress archive - run: zip -r FluCoMa-CLI-Mac-nightly.zip FluidCorpusManipulation - working-directory: release-packaging + - name: sign binaries + uses: flucoma/actions/distribution@main + with: + glob: 'fluid -t x' + package: 'release-packaging' + codesign_options: 'runtime' + output_type: 'dmg' + output: FluCoMa-CLI-Mac-nightly + cert: ${{ secrets.CERT }} + certpwd: ${{ secrets.CERTPWD }} + teamid: ${{ secrets.WWDRTEAMID }} + apppwd: ${{ secrets.APPSTORECONNECTPWD }} + appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: macbuild - path: release-packaging/FluCoMa-CLI-Mac-nightly.zip + path: release-packaging/FluCoMa-CLI-Mac-nightly.dmg linux: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/dev @@ -55,7 +69,7 @@ jobs: run: tar -zcvf FluCoMa-CLI-Linux-nightly.tar.gz FluidCorpusManipulation working-directory: release-packaging - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: linuxbuild path: release-packaging/FluCoMa-CLI-Linux-nightly.tar.gz @@ -88,7 +102,7 @@ jobs: with: name: FluCoMa CLI Nightly Release body: "This is a nightly build of the FluCoMa CLI tools. As such, be warned there may be bugs or other unexpected behaviour. The build hash is ${{ github.sha }}" - files: FluCoMa-CLI-* + files: FluCoMa* prerelease: true tag_name: nightly draft: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4808bdf..a2aead1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release +name: release on: workflow_dispatch: @@ -6,9 +6,9 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/main @@ -16,37 +16,47 @@ jobs: run: 7z a FluCoMa-CLI-Windows.zip FluidCorpusManipulation working-directory: release-packaging - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: winbuild path: release-packaging/FluCoMa-CLI-Windows.zip mac: - runs-on: macos-11 + runs-on: macos-latest steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/main - - name: compress archive - run: zip -r FluCoMa-CLI-Mac.zip FluidCorpusManipulation - working-directory: release-packaging + - name: sign binaries + uses: flucoma/actions/distribution@main + with: + glob: 'fluid -t x' + package: 'release-packaging' + codesign_options: 'runtime' + output_type: 'dmg' + output: FluCoMa-CLI-Mac + cert: ${{ secrets.CERT }} + certpwd: ${{ secrets.CERTPWD }} + teamid: ${{ secrets.WWDRTEAMID }} + apppwd: ${{ secrets.APPSTORECONNECTPWD }} + appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: macbuild - path: release-packaging/FluCoMa-CLI-Mac.zip + path: release-packaging/FluCoMa-CLI-Mac.dmg linux: runs-on: ubuntu-latest outputs: version: ${{ steps.get-version.outputs.version }} steps: - - uses: actions/checkout@v2 - - uses: flucoma/actions/env@v5 - - uses: flucoma/actions/cli@v5 + - uses: actions/checkout@v3 + - uses: flucoma/actions/env@main + - uses: flucoma/actions/cli@main with: branch: origin/main @@ -54,7 +64,7 @@ jobs: run: tar -zcvf FluCoMa-CLI-Linux.tar.gz FluidCorpusManipulation working-directory: release-packaging - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: linuxbuild path: release-packaging/FluCoMa-CLI-Linux.tar.gz