From 43dc37efead2880a9bcd807d187f8d14a0e9594e Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Wed, 18 Sep 2024 11:28:07 -0400 Subject: [PATCH 1/2] i#2511 macos-12: Remove mac fully from package script Removes other pieces of the Mac build that were not fully removed from PR #2512. Issue: #2511 --- .github/workflows/ci-package.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index e31c1e28..7d59dcd0 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -244,7 +244,7 @@ jobs: # single relese job via artifacts. create_release: - needs: [x86, osx, windows] + needs: [x86, windows] runs-on: ubuntu-20.04 steps: @@ -304,21 +304,6 @@ jobs: asset_name: DrMemory-Linux-${{ steps.version.outputs.version_number }}.tar.gz asset_content_type: application/x-gzip - - name: Download Mac - uses: actions/download-artifact@v2 - with: - name: mac-tarball - - name: Upload Mac - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - # This action doesn't seem to support a glob so we need the exact name. - asset_path: DrMemory-MacOS-${{ steps.version.outputs.osx_version_number }}.tar.gz - asset_name: DrMemory-MacOS-${{ steps.version.outputs.osx_version_number }}.tar.gz - asset_content_type: application/x-gzip - - name: Download Zip uses: actions/download-artifact@v2 with: From 2b95e7bfe0f986ad253fed90ed55b7237b561365 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Wed, 18 Sep 2024 18:44:08 -0400 Subject: [PATCH 2/2] Update download-artifact and upload-artifact to v4.x.x --- .github/workflows/ci-package.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index bb5f1efb..b36c1455 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -113,7 +113,8 @@ jobs: DEPLOY_DOCS: no - name: Upload Artifacts - uses: actions/upload-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/upload-artifact@v4 with: name: linux-tarball path: DrMemory-Linux-${{ steps.version.outputs.version_number }}.tar.gz @@ -179,13 +180,15 @@ jobs: VERSION_NUMBER: ${{ steps.version.outputs.version_number }} - name: Upload Zip - uses: actions/upload-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/upload-artifact@v4 with: name: windows-zip path: DrMemory-Windows-${{ steps.version.outputs.version_number }}.zip - name: Upload Msi - uses: actions/upload-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/upload-artifact@v4 with: name: windows-msi path: DrMemory-Windows-${{ steps.version.outputs.version_number }}.msi @@ -196,7 +199,7 @@ jobs: # succeeds and the others fail: there is no check in the create-release # action to use an existing release if it already exists. # Thus, our strategy is to share files from the build jobs with this - # single relese job via artifacts. + # single release job via artifacts. create_release: needs: [x86, windows] @@ -245,7 +248,8 @@ jobs: prerelease: false - name: Download Linux - uses: actions/download-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/download-artifact@v4 with: name: linux-tarball - name: Upload Linux @@ -260,7 +264,8 @@ jobs: asset_content_type: application/x-gzip - name: Download Zip - uses: actions/download-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/download-artifact@v4 with: name: windows-zip - name: Upload Zip @@ -275,7 +280,8 @@ jobs: asset_content_type: application/zip - name: Download Msi - uses: actions/download-artifact@v2 + # This points to the latest v4.x.x. + uses: actions/download-artifact@v4 with: name: windows-msi - name: Upload Msi