From 74084757a779fa2a16d030668703e8b7fb541a62 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 20 Jun 2022 15:29:17 -0700 Subject: [PATCH 1/5] chore: checkout corresponding branch instead of commit --- 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 63db04621..ebda5f19c 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-1.x" secrets-manager: TWINE_USERNAME: PyPiAdmin:username TWINE_PASSWORD: PyPiAdmin:password diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 8189050b2..9f9342ce7 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-1.x" secrets-manager: TWINE_USERNAME: TestPyPiCryptoTools:username TWINE_PASSWORD: TestPyPiCryptoTools:password From d3deef9da62adb377c8245f3c03525e8ea223194 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 20 Jun 2022 22:01:53 -0700 Subject: [PATCH 2/5] 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 ebda5f19c..2d224e0d3 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -14,6 +14,7 @@ phases: build: commands: - pip install tox + - git fetch origin $BRANCH:$BRANCH --depth=1; - git checkout $BRANCH - tox -e park - tox -e release diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 9f9342ce7..bbe2b7518 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -14,6 +14,7 @@ phases: build: commands: - pip install tox + - git fetch origin $BRANCH:$BRANCH --depth=1; - git checkout $BRANCH - tox -e park - tox -e test-release From a7716dbfade0ef311d112bf284f697af82012cdd Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 20 Jun 2022 22:22:22 -0700 Subject: [PATCH 3/5] remove ; --- 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 2d224e0d3..f1f777418 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -14,7 +14,7 @@ phases: build: commands: - pip install tox - - git fetch origin $BRANCH:$BRANCH --depth=1; + - git fetch origin $BRANCH:$BRANCH --depth=1 - git checkout $BRANCH - tox -e park - tox -e release diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index bbe2b7518..a484e45a2 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -14,7 +14,7 @@ phases: build: commands: - pip install tox - - git fetch origin $BRANCH:$BRANCH --depth=1; + - git fetch origin $BRANCH:$BRANCH --depth=1 - git checkout $BRANCH - tox -e park - tox -e test-release From 6e0c98052d25a3bbe19c6c65070a63b73d149a82 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 21 Jun 2022 09:19:15 -0700 Subject: [PATCH 4/5] 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 f1f777418..339e23fd9 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -15,7 +15,7 @@ phases: commands: - pip install tox - git fetch origin $BRANCH:$BRANCH --depth=1 - - git checkout $BRANCH + - git checkout $COMMIT_ID - tox -e park - tox -e release - git clone https://github.com/aws-samples/busy-engineers-document-bucket.git diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index a484e45a2..8273a3a65 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -15,7 +15,7 @@ phases: commands: - pip install tox - git fetch origin $BRANCH:$BRANCH --depth=1 - - git checkout $BRANCH + - git checkout $COMMIT_ID - tox -e park - tox -e test-release From 22f8ae1798d71fbcd6362e4f62864abddfaf649c Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 21 Jun 2022 09:34:56 -0700 Subject: [PATCH 5/5] 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 339e23fd9..3927e9f33 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -1,8 +1,6 @@ version: 0.2 env: - variables: - BRANCH: "mainline-1.x" secrets-manager: TWINE_USERNAME: PyPiAdmin:username TWINE_PASSWORD: PyPiAdmin:password @@ -14,7 +12,7 @@ phases: build: commands: - pip install tox - - git fetch origin $BRANCH:$BRANCH --depth=1 + - git fetch origin $COMMIT_ID:$COMMIT_ID --depth=1 - git checkout $COMMIT_ID - tox -e park - tox -e release diff --git a/codebuild/release/test-release.yml b/codebuild/release/test-release.yml index 8273a3a65..f0ae96097 100644 --- a/codebuild/release/test-release.yml +++ b/codebuild/release/test-release.yml @@ -1,8 +1,6 @@ version: 0.2 env: - variables: - BRANCH: "mainline-1.x" secrets-manager: TWINE_USERNAME: TestPyPiCryptoTools:username TWINE_PASSWORD: TestPyPiCryptoTools:password @@ -14,7 +12,7 @@ phases: build: commands: - pip install tox - - git fetch origin $BRANCH:$BRANCH --depth=1 + - git fetch origin $COMMIT_ID:$COMMIT_ID --depth=1 - git checkout $COMMIT_ID - tox -e park - tox -e test-release