Skip to content

Commit d2411ab

Browse files
Merge branch 'develop' into feature/made14-NRL-1351-perms-manager-cli
2 parents a561c93 + f5da0e9 commit d2411ab

File tree

163 files changed

+2863
-6778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+2863
-6778
lines changed

.github/workflows/pr-env-destroy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ run-name: "Destroy PR Environment - #${{ github.event.pull_request.number }} (${
44
on:
55
pull_request:
66
types: [closed]
7+
workflow_dispatch:
78

89
concurrency:
910
group: environment-${{ github.event.pull_request.number }}
@@ -73,9 +74,11 @@ jobs:
7374
- name: Terraform Init
7475
run: |
7576
terraform -chdir=terraform/infrastructure init
76-
terraform -chdir=terraform/infrastructure workspace new ${{ needs.set-environment-id.outputs.environment_id }} || \
7777
terraform -chdir=terraform/infrastructure workspace select ${{ needs.set-environment-id.outputs.environment_id }}
7878
79+
- name: Build artifacts
80+
run: make build get-s3-perms
81+
7982
- name: Terraform Destroy
8083
run: |
8184
terraform -chdir=terraform/infrastructure destroy \

.tool-versions

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
awscli 2.15.11
2-
poetry 1.8.2
1+
allure 2.34.0
2+
awscli 2.27.20
33
jq 1.7.1
4-
python 3.12.2
4+
k6 1.0.0
5+
poetry 1.8.5
6+
python 3.12.10
57
terraform 1.9.8
6-
java zulu-jre-17.42.19
7-
yq 4.35.2
8-
allure 2.27.0
9-
k6 0.50.0
8+
yq 4.45.4

0 commit comments

Comments
 (0)