Skip to content

Commit 1f1f802

Browse files
committed
[NRL-1375] Fixup environment changes in workflows for codebuild
1 parent e955472 commit 1f1f802

File tree

3 files changed

+10
-31
lines changed

3 files changed

+10
-31
lines changed

.github/workflows/activate-stack.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,10 @@ jobs:
3232
with:
3333
ref: ${{ github.ref }}
3434

35-
- name: Setup asdf cache
36-
uses: actions/cache@v4
37-
with:
38-
path: ~/.asdf
39-
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
40-
restore-keys: |
41-
${{ runner.os }}-asdf-
42-
43-
- name: Install asdf
44-
uses: asdf-vm/actions/[email protected]
45-
with:
46-
asdf_branch: v0.13.1
35+
- name: Setup environment
36+
run: |
37+
echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
38+
poetry install --no-root
4739
4840
- name: Configure Management Credentials
4941
uses: aws-actions/configure-aws-credentials@v4
@@ -52,14 +44,6 @@ jobs:
5244
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
5345
role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
5446

55-
- name: Install zip
56-
run: sudo apt-get install zip
57-
58-
- name: Setup Python environment
59-
run: |
60-
poetry install --no-root
61-
source $(poetry env info --path)/bin/activate
62-
6347
- name: Get current environment config
6448
run: |
6549
poetry run python ./scripts/get_env_config.py all ${{ inputs.environment }}

.github/workflows/persistent-environment.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,6 @@ jobs:
283283
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
284284
role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
285285

286-
- name: Setup Python environment
287-
run: |
288-
poetry install --no-root
289-
source $(poetry env info --path)/bin/activate
290-
291286
- name: Deactivate Stack
292287
run: |
293288
inactive_stack_name=$(poetry run python ./scripts/get_env_config.py inactive-stack ${{ inputs.environment }})

.github/workflows/update-lambda-permissions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
with:
3838
ref: ${{ github.ref }}
3939

40-
- name: Setup Python environment
40+
- name: Setup environment
4141
run: |
42+
echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
4243
poetry install --no-root
43-
source $(poetry env info --path)/bin/activate
4444
4545
- name: Configure Management Credentials
4646
uses: aws-actions/configure-aws-credentials@v4
@@ -85,10 +85,10 @@ jobs:
8585
with:
8686
ref: ${{ github.ref }}
8787

88-
- name: Setup Python environment
88+
- name: Setup environment
8989
run: |
90+
echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
9091
poetry install --no-root
91-
source $(poetry env info --path)/bin/activate
9292
9393
- name: Configure Management Credentials
9494
uses: aws-actions/configure-aws-credentials@v4
@@ -160,10 +160,10 @@ jobs:
160160
with:
161161
ref: ${{ github.ref }}
162162

163-
- name: Setup Python environment
163+
- name: Setup environment
164164
run: |
165+
echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
165166
poetry install --no-root
166-
source $(poetry env info --path)/bin/activate
167167
168168
- name: Restore pulled lambda artifacts
169169
uses: actions/cache/restore@v4

0 commit comments

Comments
 (0)