From b5bacb868f00e08d16aed9bce9a9eb2436bf34a4 Mon Sep 17 00:00:00 2001 From: Stephen Cefali Date: Mon, 8 Jan 2024 09:32:34 -0800 Subject: [PATCH 1/4] update cli version --- package.json | 2 +- yarn.lock | 59 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b5b0ea1c..af0b31f8 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", - "@sentry/cli": "^1.67.2" + "@sentry/cli": "^2.24.1" }, "devDependencies": { "@types/jest": "^29.5.6", diff --git a/yarn.lock b/yarn.lock index 0b5b4a13..c9086100 100644 --- a/yarn.lock +++ b/yarn.lock @@ -659,17 +659,59 @@ picocolors "^1.0.0" tslib "^2.6.0" -"@sentry/cli@^1.67.2": - version "1.75.2" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.75.2.tgz#2c38647b38300e52c9839612d42b7c23f8d6455b" - integrity sha512-CG0CKH4VCKWzEaegouWfCLQt9SFN+AieFESCatJ7zSuJmzF05ywpMusjxqRul6lMwfUhRKjGKOzcRJ1jLsfTBw== +"@sentry/cli-darwin@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.24.1.tgz#feae406b2bf9a6a736e5a6f31e5561aaae8ed902" + integrity sha512-L6puTcZn5AarTL9YCVCSSCJoMV7opMx5hwwl0+sQGbLO8BChuC2QZl+j4ftEb3WgnFcT5+OODBlu4ocREtG7sQ== + +"@sentry/cli-linux-arm64@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.24.1.tgz#a3e5339904fcb89167736a4a3c6edcd697972c24" + integrity sha512-47fq/sOZnY8oSnuEurlplHKlcEhCf4Pd3JHmV6N8dYYwPEapoELb3V53BDPhjkj/rwdpJf8T90+LXCQkeF/o+w== + +"@sentry/cli-linux-arm@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.24.1.tgz#3784604555de7baa17b0b7ae8b7912d37d52738e" + integrity sha512-wnOeIl0NzUdSvz7kJKTovksDUwx6TTyV1iBjM19gZGqi+hfNc1bUa1IDGSY0m/T+CpSZiuKL0M36sYet5euDUQ== + +"@sentry/cli-linux-i686@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.24.1.tgz#9ba0c0eaa783bd955060ea105278c2856c42755f" + integrity sha512-OjpP1aRV0cwdtcics0hv8tZR6Bl5+1KIc+0habMeMxfTN7FvGmJb3ZTpuhi8OJLDglppQe6KlWzEFi8UgcE42Q== + +"@sentry/cli-linux-x64@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.24.1.tgz#b7d157b66f76a5ac47a43b934eadeec50e9c5640" + integrity sha512-GfryILChjrgSGBrT90ln46qt6UTI1ebevcDPoWArftTQ0n+P4tPFcfA9bCMV16Jsnc59CtjMFlQknLOAWnezgg== + +"@sentry/cli-win32-i686@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.24.1.tgz#b01158d6e633a2e6dfed59feaeb6979a32d7632c" + integrity sha512-COi7b/g3BbJHlJfF7GA0LAw/foyP3rMfDLQid/4fj7a0DqNjwAJRgazXvvtAY7/3XThHVE/sgLH0UmAgYaBBpA== + +"@sentry/cli-win32-x64@2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.24.1.tgz#8b8752606939d229207b1afe6d4a254d24acb47c" + integrity sha512-gJxQw9ppRgZecMZ4t7mi5zWTFssVFbO2V35Nq6qk9bwHACa/LjQbyRqSqOg6zil8QruGvH1oQYClFZHlW8EHuA== + +"@sentry/cli@^2.24.1": + version "2.24.1" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.24.1.tgz#9b643ee44c7b2be7cf9b9435b7eea4b92bdfd6cd" + integrity sha512-eXqbKRzychtG8mMfGmqc0DRY677ngHRYa3aVS8f0VVKHK4PPV/ta08ORs0iS73IaasP563r8YEzpYjD74GtSZA== dependencies: https-proxy-agent "^5.0.0" - mkdirp "^0.5.5" node-fetch "^2.6.7" progress "^2.0.3" proxy-from-env "^1.1.0" which "^2.0.2" + optionalDependencies: + "@sentry/cli-darwin" "2.24.1" + "@sentry/cli-linux-arm" "2.24.1" + "@sentry/cli-linux-arm64" "2.24.1" + "@sentry/cli-linux-i686" "2.24.1" + "@sentry/cli-linux-x64" "2.24.1" + "@sentry/cli-win32-i686" "2.24.1" + "@sentry/cli-win32-x64" "2.24.1" "@sinclair/typebox@^0.27.8": version "0.27.8" @@ -3080,13 +3122,6 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -mkdirp@^0.5.5: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" From 488061884146c58b7e4a1508feadc77648fa37d0 Mon Sep 17 00:00:00 2001 From: Stephen Cefali Date: Mon, 8 Jan 2024 09:41:10 -0800 Subject: [PATCH 2/4] remove docker line for moving binary --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3565d89..60a20162 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,6 @@ RUN export YARN_CACHE_FOLDER="$(mktemp -d)" \ COPY --from=builder /app/dist /action-release/dist/ RUN chmod +x /action-release/dist/index.js -# move the sentry-cli binary to where the entrypoint expects it -RUN mv /action-release/node_modules/@sentry/cli/sentry-cli /action-release/sentry-cli -RUN chmod +x /action-release/sentry-cli # XXX: This could probably be replaced with a standard CMD COPY entrypoint.sh /entrypoint.sh From d29451146a4c79f44151a943c7e95f969c238101 Mon Sep 17 00:00:00 2001 From: Stephen Cefali Date: Mon, 8 Jan 2024 09:43:37 -0800 Subject: [PATCH 3/4] add hacks --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 60a20162..04531917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,9 @@ RUN export YARN_CACHE_FOLDER="$(mktemp -d)" \ COPY --from=builder /app/dist /action-release/dist/ RUN chmod +x /action-release/dist/index.js +RUN printf '[safe]\n directory = *\n' > /etc/gitconfig +# Workaround for this issue: https://github.com/libgit2/libgit2/issues/6663 +ENV SUDO_UID=1001 # XXX: This could probably be replaced with a standard CMD COPY entrypoint.sh /entrypoint.sh From d5c1f5392a2c551714c30d048c0d06afab968f24 Mon Sep 17 00:00:00 2001 From: Stephen Cefali Date: Mon, 8 Jan 2024 09:45:57 -0800 Subject: [PATCH 4/4] remove hack --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04531917..c339e476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,6 @@ COPY --from=builder /app/dist /action-release/dist/ RUN chmod +x /action-release/dist/index.js RUN printf '[safe]\n directory = *\n' > /etc/gitconfig -# Workaround for this issue: https://github.com/libgit2/libgit2/issues/6663 -ENV SUDO_UID=1001 # XXX: This could probably be replaced with a standard CMD COPY entrypoint.sh /entrypoint.sh