Skip to content

Add arch name to archive files created in the upload workflow #4679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2021
Merged

Add arch name to archive files created in the upload workflow #4679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529243b
Add arch name to archive files created in the upload workflow
autarch Jan 31, 2021
16fcb28
Fix arch names in matrix.build key to include arch name as well
autarch Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/upload-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ jobs:
name: build-release
strategy:
matrix:
build: [linux, macos, windows-gnu, windows-msvc]
build: [linux-x86_64, macos-x86_64, windows-x86_64-gnu, windows-x86_64-msvc]
include:
- build: linux
- build: linux-x86_64
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that updating this would require the corresponding values in build so that the matrix legs will still match.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do. I'll push it as a separate commit but if you want me to rebase it into one I can do that too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great thanks! And no worries. In cases like this where the diff is so small it's fine to squash the changes on the original commit, but will just squash on merge

os: ubuntu-latest
rust: nightly
- build: macos
- build: macos-x86_64
os: macos-latest
rust: nightly
- build: windows-gnu
- build: windows-x86_64-gnu
os: windows-latest
rust: nightly-x86_64-gnu
- build: windows-msvc
- build: windows-x86_64-msvc
os: windows-latest
rust: nightly-x86_64-msvc
runs-on: ${{ matrix.os }}
Expand Down