diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-18 09:14:09 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-11-18 11:16:35 -0800 |
| commit | e9a9bc128247f95b0881dcafa098e7d5900302ce (patch) | |
| tree | 186711400c0338aa1b270c86e277e6676766a64e /.github | |
| parent | c2d5de207d5bc840087da8fd72fcb8a83493148c (diff) | |
| download | subsurface-e9a9bc128247f95b0881dcafa098e7d5900302ce.tar.gz | |
GitHub actions: fix macOS artifact upload
Previously this created a bogus Subsurface.app.zip.zip file and then
failed to upload it to the release.
The upload / download pair of default actions is happier with just the folder.
And then the creation of the zip file needs the '-r' switch. Oops.
Finally, the pull-request specific uploads as build artifact are completely
redundant since we already do this to move the data from the macOS build to the
container that runs our own publish action in the first place.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/mac.yml | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 515c7e37f..11548442b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -82,12 +82,11 @@ jobs: ln -s ${GRANTLEE_VERSION}/$(basename $i) . popd done - zip Subsurface.app.zip Subsurface.app - name: store artifact uses: actions/upload-artifact@master with: - name: Subsurface.app.zip - path: build/Subsurface.app.zip + name: Subsurface.app + path: build/Subsurface.app publishRelease: needs: desktopBuild @@ -100,7 +99,10 @@ jobs: - name: retrieve artifact uses: actions/download-artifact@master with: - name: Subsurface.app.zip + name: Subsurface.app + - name: create zip file + run: | + zip -r Subsurface.app.zip Subsurface.app - name: create CI release if: github.event_name == 'push' uses: ./.github/actions/release @@ -110,16 +112,3 @@ jobs: REF: ${{ github.ref }} COMMIT: ${{ github.sha }} BIN1: Subsurface.app.zip - - - name: prepare PR artifacts - if: github.event_name == 'pull_request' - run: | - mkdir -p Mac-artifacts - mv Subsurface.app.zip Mac-artifacts - - - name: PR artifacts - if: github.event_name == 'pull_request' - uses: actions/upload-artifact@master - with: - name: Mac-artifacts - path: Mac-artifacts |