From 7fc511a8dfc8b238988a9b90d09d06e1da99cf10 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 20 Jun 2022 15:00:29 -0700 Subject: [PATCH 1/4] chore: checkout corresponding branch instead of commit --- codebuild/release/prod-release.yml | 4 ++-- codebuild/release/test-release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index aa985e361..7de38f987 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -2,7 +2,7 @@ version: 0.2 env: variables: - BRANCH: "master" + BRANCH: "mainline-2.x" secrets-manager: TWINE_USERNAME: PyPiAdmin:username TWINE_PASSWORD: PyPiAdmin:password @@ -16,7 +16,7 @@ phases: python: latest pre_build: commands: - - git checkout $COMMIT_ID + - git checkout $BRANCH - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | if expr ${FOUND_VERSION} != ${VERSION}; then diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 6c0ce85c9..80ac9319e 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -2,7 +2,7 @@ version: 0.2 env: variables: - BRANCH: "master" + BRANCH: "mainline-2.x" secrets-manager: TWINE_USERNAME: TestPyPiCryptoTools:username TWINE_PASSWORD: TestPyPiCryptoTools:password @@ -16,7 +16,7 @@ phases: python: latest pre_build: commands: - - git checkout $COMMIT_ID + - git checkout $BRANCH - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | if expr ${FOUND_VERSION} != ${VERSION}; then From 5610b59c2dceb3131a5815199165ceb4b2bad550 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 20 Jun 2022 22:20:05 -0700 Subject: [PATCH 2/4] fetch only what we want --- codebuild/release/prod-release.yml | 1 + codebuild/release/test-release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 7de38f987..1fa598e2b 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -16,6 +16,7 @@ phases: python: latest pre_build: commands: + - git fetch origin $BRANCH:$BRANCH --depth=1 - git checkout $BRANCH - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 80ac9319e..22054a7bf 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -16,6 +16,7 @@ phases: python: latest pre_build: commands: + - git fetch origin $BRANCH:$BRANCH --depth=1 - git checkout $BRANCH - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | From f4be27e00dccc2287d2b3bda606b5e550bbac362 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 21 Jun 2022 09:22:39 -0700 Subject: [PATCH 3/4] use commit id instead of branch --- codebuild/release/prod-release.yml | 2 +- codebuild/release/test-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 1fa598e2b..74f8a16eb 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -17,7 +17,7 @@ phases: pre_build: commands: - git fetch origin $BRANCH:$BRANCH --depth=1 - - git checkout $BRANCH + - git checkout $COMMIT_ID - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | if expr ${FOUND_VERSION} != ${VERSION}; then diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 22054a7bf..20afbc534 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -17,7 +17,7 @@ phases: pre_build: commands: - git fetch origin $BRANCH:$BRANCH --depth=1 - - git checkout $BRANCH + - git checkout $COMMIT_ID - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | if expr ${FOUND_VERSION} != ${VERSION}; then From 7d2c9ebe49f1b0dfbff31040400c1b9dd0b2a2e3 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 21 Jun 2022 09:52:30 -0700 Subject: [PATCH 4/4] fetch commit id instead of branch --- codebuild/release/prod-release.yml | 4 +--- codebuild/release/test-release.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 74f8a16eb..2a01495d2 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -1,8 +1,6 @@ version: 0.2 env: - variables: - BRANCH: "mainline-2.x" secrets-manager: TWINE_USERNAME: PyPiAdmin:username TWINE_PASSWORD: PyPiAdmin:password @@ -16,7 +14,7 @@ phases: python: latest pre_build: commands: - - git fetch origin $BRANCH:$BRANCH --depth=1 + - git fetch origin $COMMIT_ID:$COMMIT_ID --depth=1 - git checkout $COMMIT_ID - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - | diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 20afbc534..ad2109df8 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -1,8 +1,6 @@ version: 0.2 env: - variables: - BRANCH: "mainline-2.x" secrets-manager: TWINE_USERNAME: TestPyPiCryptoTools:username TWINE_PASSWORD: TestPyPiCryptoTools:password @@ -16,7 +14,7 @@ phases: python: latest pre_build: commands: - - git fetch origin $BRANCH:$BRANCH --depth=1 + - git fetch origin $COMMIT_ID:$COMMIT_ID --depth=1 - git checkout $COMMIT_ID - FOUND_VERSION=$(sed -n 's/__version__ = "\(.*\)"/\1/p' src/aws_encryption_sdk/identifiers.py) - |