From a486f0086a419f5efd6f86cf6d85b9daddc0e31f Mon Sep 17 00:00:00 2001 From: William Mak Date: Fri, 3 Jun 2022 13:36:45 -0400 Subject: [PATCH 1/3] feat(api): Update the bump script since CI doesn't run it - this is so the script can be run on MacOS where the date function is slightly different --- scripts/bump-version.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index a4833ac0d51d29..cc4221b55e7529 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -5,5 +5,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR/.. SENTRY_API_SCHEMA_SHA="$(curl -sSL 'https://api.github.com/repos/getsentry/sentry-api-schema/commits/main' | awk 'BEGIN { RS=",|:{\n"; FS="\""; } $2 == "sha" { print $4 }')" -sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE -sed -i -e 's|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = "'$SENTRY_API_SCHEMA_SHA'"|g' src/gatsby/utils/resolveOpenAPI.ts +# These lines used to be run by CI, but we don't use that anymore +# sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE +# sed -i -e 's|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = "'$SENTRY_API_SCHEMA_SHA'"|g' src/gatsby/utils/resolveOpenAPI.ts From 825f0de759b7723623437ead2a16ad9828b43991 Mon Sep 17 00:00:00 2001 From: William Mak Date: Fri, 3 Jun 2022 13:51:07 -0400 Subject: [PATCH 2/3] ref: Keep the sed commands on default --- scripts/bump-version.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index cc4221b55e7529..93ea6d7a2e020c 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -5,6 +5,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR/.. SENTRY_API_SCHEMA_SHA="$(curl -sSL 'https://api.github.com/repos/getsentry/sentry-api-schema/commits/main' | awk 'BEGIN { RS=",|:{\n"; FS="\""; } $2 == "sha" { print $4 }')" -# These lines used to be run by CI, but we don't use that anymore -# sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE -# sed -i -e 's|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = "'$SENTRY_API_SCHEMA_SHA'"|g' src/gatsby/utils/resolveOpenAPI.ts +# These commands won't work on our machines since they're running macosx +if [ "${1:-prod}" != "local" ]; then + sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE + sed -i -e 's|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = "'$SENTRY_API_SCHEMA_SHA'"|g' src/gatsby/utils/resolveOpenAPI.ts +fi From cc5ecb89d17d987f4ef90ef85d4c7799e4622ce3 Mon Sep 17 00:00:00 2001 From: William Mak Date: Fri, 3 Jun 2022 13:52:43 -0400 Subject: [PATCH 3/3] change the comparison --- scripts/bump-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 93ea6d7a2e020c..def29ff84244a9 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -6,7 +6,7 @@ cd $SCRIPT_DIR/.. SENTRY_API_SCHEMA_SHA="$(curl -sSL 'https://api.github.com/repos/getsentry/sentry-api-schema/commits/main' | awk 'BEGIN { RS=",|:{\n"; FS="\""; } $2 == "sha" { print $4 }')" # These commands won't work on our machines since they're running macosx -if [ "${1:-prod}" != "local" ]; then +if [ "${1:-prod}" == "prod" ]; then sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE sed -i -e 's|^const SENTRY_API_SCHEMA_SHA =.*$|const SENTRY_API_SCHEMA_SHA = "'$SENTRY_API_SCHEMA_SHA'"|g' src/gatsby/utils/resolveOpenAPI.ts fi