Skip to content

Commit

Permalink
removed duplicate Mac zips in actions cache
Browse files Browse the repository at this point in the history
  • Loading branch information
JanBliznicenko committed Oct 17, 2024
1 parent e81d3e7 commit 01d6b30
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 31 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,11 @@ jobs:
run: ci-scripts/.github/scripts/build-mac.sh
env:
ACTIONS_READ_ACCESS_TOKEN: ${{ secrets.ACTIONS_READ_ACCESS_TOKEN }}
- name: Cache Intel zip
- name: Cache zip
uses: actions/cache/[email protected]
with:
path: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
key: ${{ github.run_id }}-${{ github.run_number }}_${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
- name: Cache ARM zip
uses: actions/cache/[email protected]
with:
path: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
key: ${{ github.run_id }}-${{ github.run_number }}_${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip

build-mac-m1:
runs-on: macos-14
Expand Down Expand Up @@ -167,16 +162,11 @@ jobs:
run: ci-scripts/.github/scripts/build-mac.sh
env:
ACTIONS_READ_ACCESS_TOKEN: ${{ secrets.ACTIONS_READ_ACCESS_TOKEN }}
- name: Cache Intel zip
- name: Cache zip
uses: actions/cache/[email protected]
with:
path: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
key: ${{ github.run_id }}-${{ github.run_number }}_${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
- name: Cache ARM zip
uses: actions/cache/[email protected]
with:
path: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
key: ${{ github.run_id }}-${{ github.run_number }}_${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip

check-cache-linux:
needs: build-linux
Expand Down
22 changes: 3 additions & 19 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,14 @@ jobs:
- name: Get release
id: get_release
uses: bruceadams/[email protected]
- name: Upload Intel zip
id: upload-zip-intel
- name: Upload zip
id: upload-zip
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ./${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
asset_name: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
asset_content_type: application/zip
- name: Upload ARM zip
id: upload-zip-arm
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ./${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
asset_name: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
asset_content_type: application/zip

build-mac-m1:
runs-on: macos-14
Expand Down Expand Up @@ -181,18 +173,10 @@ jobs:
id: get_release
uses: bruceadams/[email protected]
- name: Upload Intel zip
id: upload-zip-intel
id: upload-zip
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ./${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
asset_name: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-${{ env.VERSION }}.zip
asset_content_type: application/zip
- name: Upload ARM zip
id: upload-zip-arm
uses: actions/[email protected]
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ./${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
asset_name: ${{ env.PROJECT_NAME }}-${{ env.PLATFORM }}-ARM-${{ env.VERSION }}.zip
asset_content_type: application/zip

0 comments on commit 01d6b30

Please sign in to comment.