Skip to content
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.

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

ci: update actions/upload-artifact to v4 with merge #2158

Merged
merged 10 commits into from
Sep 23, 2024

Conversation

joshuarli
Copy link
Member

@joshuarli joshuarli commented Sep 18, 2024

Retrying upload-artifact v4 update (see #2119) by using artifacts/merge to merge together multiple artifacts from different jobs into the single one named github.sha that craft expects.

Summarily, upload-artifact v3 is deprecated but v4 doesn't support mutating an artifact with the name name by uploading different filepaths to the same artifact. Because we need a single artifact "github.sha", we have to use actions/merge to create it. Alternatively craft could be modified but this is the easiest way forward and I like the idea of a unified artifact, it makes craft simpler.

ref: getsentry/craft#552

@joshuarli
Copy link
Member Author

joshuarli commented Sep 18, 2024

the new {{ github.sha }} artifact has a cleaned up (but functionally the same) structure to current release artifacts.

before:

Archive:  c54284c34dc3e7fce3bcff9df37d018defcf5f44.zip
  Length      Date    Time    Name
---------  ---------- -----   ----
        0  09-10-2024 10:40   darwin/
        0  09-10-2024 10:40   linux-arm/
        0  09-10-2024 10:40   linux-arm64/
        0  09-10-2024 10:40   linux-i686/
        0  09-10-2024 10:40   linux-x64/
    20716  09-10-2024 10:39   sentry-cli-2.36.1.tgz
  8068504  09-10-2024 10:35   sentry-cli-Darwin-arm64
 17128856  09-10-2024 10:35   sentry-cli-Darwin-universal
  9041632  09-10-2024 10:35   sentry-cli-Darwin-x86_64
 11397464  09-10-2024 10:36   sentry-cli-Linux-aarch64
 10531796  09-10-2024 10:36   sentry-cli-Linux-armv7
 12076792  09-10-2024 10:36   sentry-cli-Linux-i686
 14423888  09-10-2024 10:36   sentry-cli-Linux-x86_64
  7396864  09-10-2024 10:39   sentry-cli-Windows-i686.exe
  8596480  09-10-2024 10:38   sentry-cli-Windows-x86_64.exe
  9051366  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-macosx_10_15_x86_64.whl
  8078236  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-macosx_11_0_arm64.whl
 17138594  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-macosx_11_0_universal2.whl
 11407274  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_2_aarch64.whl
 10541603  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_2_armv7l.whl
 12086593  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.musllinux_1_2_i686.whl
 14433695  09-10-2024 10:39   sentry_cli-2.36.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.musllinux_1_2_x86_64.whl
  8606216  09-10-2024 10:40   sentry_cli-2.36.1-py3-none-win_amd64.whl
  7406596  09-10-2024 10:40   sentry_cli-2.36.1-py3-none-win32.whl
   200975  09-10-2024 10:40   sentry_cli-2.36.1.tar.gz
        0  09-10-2024 10:40   win32-i686/
        0  09-10-2024 10:40   win32-x64/
  7430122  09-10-2024 10:40   darwin/sentry-cli-darwin-2.36.1.tgz
  5128354  09-10-2024 10:40   linux-arm/sentry-cli-linux-arm-2.36.1.tgz
  5962792  09-10-2024 10:40   linux-arm64/sentry-cli-linux-arm64-2.36.1.tgz
  5682831  09-10-2024 10:40   linux-i686/sentry-cli-linux-i686-2.36.1.tgz
  5943470  09-10-2024 10:40   linux-x64/sentry-cli-linux-x64-2.36.1.tgz
  3660702  09-10-2024 10:40   win32-i686/sentry-cli-win32-i686-2.36.1.tgz
  3858667  09-10-2024 10:40   win32-x64/sentry-cli-win32-x64-2.36.1.tgz
---------                     -------
235301078                     34 files

after:

Archive:  8c24c9695db0c4ab939e81e9643baddd467553c6.zip
  Length      Date    Time    Name
---------  ---------- -----   ----
  7430122  09-18-2024 20:03   darwin/sentry-cli-darwin-2.36.1.tgz
  5128354  09-18-2024 20:03   linux-arm/sentry-cli-linux-arm-2.36.1.tgz
  5962792  09-18-2024 20:03   linux-arm64/sentry-cli-linux-arm64-2.36.1.tgz
  5682831  09-18-2024 20:03   linux-i686/sentry-cli-linux-i686-2.36.1.tgz
  5943469  09-18-2024 20:03   linux-x64/sentry-cli-linux-x64-2.36.1.tgz
    20721  09-18-2024 20:03   sentry-cli-2.36.1.tgz
  8068504  09-18-2024 20:03   sentry-cli-Darwin-arm64
 17128856  09-18-2024 20:03   sentry-cli-Darwin-universal
  9041632  09-18-2024 20:03   sentry-cli-Darwin-x86_64
 11397464  09-18-2024 20:03   sentry-cli-Linux-aarch64
 10531796  09-18-2024 20:03   sentry-cli-Linux-armv7
 12076792  09-18-2024 20:03   sentry-cli-Linux-i686
 14423888  09-18-2024 20:03   sentry-cli-Linux-x86_64
  7396864  09-18-2024 20:03   sentry-cli-Windows-i686.exe
  8596480  09-18-2024 20:03   sentry-cli-Windows-x86_64.exe
  5816807  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-linux_x86_64.whl
  9051366  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-macosx_10_15_x86_64.whl
  8078236  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-macosx_11_0_arm64.whl
 17138594  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-macosx_11_0_universal2.whl
 11407274  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_2_aarch64.whl
 10541603  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_2_armv7l.whl
 12086593  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.musllinux_1_2_i686.whl
 14433695  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.musllinux_1_2_x86_64.whl
  7406596  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-win32.whl
  8606216  09-18-2024 20:03   sentry_cli-2.36.1-py3-none-win_amd64.whl
   200951  09-18-2024 20:03   sentry_cli-2.36.1.tar.gz
  3660701  09-18-2024 20:03   win32-i686/sentry-cli-win32-i686-2.36.1.tgz
  3858668  09-18-2024 20:03   win32-x64/sentry-cli-win32-x64-2.36.1.tgz
---------                     -------
241117865                     28 files

@joshuarli joshuarli marked this pull request as ready for review September 18, 2024 20:56
@szokeasaurusrex
Copy link
Member

Hey @joshuarli, thanks for the PR. Just to confirm, have you tested already that this works, or is the only way to know for sure to attempt a new Sentry CLI release?

@joshuarli
Copy link
Member Author

Hey @joshuarli, thanks for the PR. Just to confirm, have you tested already that this works, or is the only way to know for sure to attempt a new Sentry CLI release?

I demonstrated above that the structure of the release artifact 8c24c96.zip is the same (cleaner). Build: https://github.com/getsentry/sentry-cli/actions/runs/10929197033

But yes, we won't know for sure until a new release is run in full since that has to go through craft.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants