Skip to content

Commit b640f29

Browse files
authored
Merge pull request #73 from acm-uiuc/dsingh14/policy-refinement
Assume the entra role for entra actions
2 parents 2e5ae13 + 7e051f0 commit b640f29

File tree

14 files changed

+800
-189
lines changed

14 files changed

+800
-189
lines changed

.github/workflows/deploy-dev.yml

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,38 @@ on:
66
pull_request:
77
branches:
88
- main
9+
910
jobs:
1011
test-unit:
1112
runs-on: ubuntu-latest
1213
name: Run Unit Tests
1314
steps:
15+
- uses: actions/checkout@v4
16+
env:
17+
HUSKY: "0"
18+
1419
- name: Set up Node
1520
uses: actions/setup-node@v4
1621
with:
1722
node-version: 22.x
18-
- uses: actions/checkout@v4
19-
env:
20-
HUSKY: "0"
23+
cache: 'yarn'
24+
25+
- name: Restore Yarn Cache
26+
uses: actions/cache@v4
27+
with:
28+
path: node_modules
29+
key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
30+
restore-keys: |
31+
yarn-modules-${{ runner.os }}-
32+
2133
- name: Set up Python 3.11 for testing
2234
uses: actions/setup-python@v5
2335
with:
2436
python-version: 3.11
37+
2538
- name: Run unit testing
2639
run: make test_unit
40+
2741
deploy-dev:
2842
runs-on: ubuntu-latest
2943
permissions:
@@ -37,25 +51,39 @@ jobs:
3751
needs:
3852
- test-unit
3953
steps:
54+
- uses: actions/checkout@v4
55+
env:
56+
HUSKY: "0"
57+
4058
- name: Set up Node for testing
4159
uses: actions/setup-node@v4
4260
with:
4361
node-version: 22.x
44-
- uses: actions/checkout@v4
45-
env:
46-
HUSKY: "0"
62+
cache: 'yarn'
63+
64+
- name: Restore Yarn Cache
65+
uses: actions/cache@v4
66+
with:
67+
path: node_modules
68+
key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
69+
restore-keys: |
70+
yarn-modules-${{ runner.os }}-
71+
4772
- uses: aws-actions/setup-sam@v2
4873
with:
4974
use-installer: true
75+
5076
- name: Set up Python 3.11
5177
uses: actions/setup-python@v5
5278
with:
5379
python-version: 3.11
80+
5481
- uses: aws-actions/configure-aws-credentials@v4
5582
with:
5683
role-to-assume: arn:aws:iam::427040638965:role/GitHubActionsRole
5784
role-session-name: Core_Dev_Deployment
5885
aws-region: us-east-1
86+
5987
- name: Publish to AWS
6088
run: make deploy_dev
6189
env:
@@ -71,23 +99,37 @@ jobs:
7199
group: ${{ github.event.repository.name }}-dev-env
72100
cancel-in-progress: false
73101
steps:
102+
- uses: actions/checkout@v4
103+
env:
104+
HUSKY: "0"
105+
cache: 'yarn'
106+
74107
- name: Set up Node
75108
uses: actions/setup-node@v4
76109
with:
77110
node-version: 22.x
78-
- uses: actions/checkout@v4
79-
env:
80-
HUSKY: "0"
111+
112+
- name: Restore Yarn Cache
113+
uses: actions/cache@v4
114+
with:
115+
path: node_modules
116+
key: yarn-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
117+
restore-keys: |
118+
yarn-modules-${{ runner.os }}-
119+
81120
- name: Set up Python 3.11 for testing
82121
uses: actions/setup-python@v5
83122
with:
84123
python-version: 3.11
124+
85125
- name: Run health check
86126
run: make dev_health_check
127+
87128
- name: Run live testing
88129
run: make test_live_integration
89130
env:
90131
JWT_KEY: ${{ secrets.JWT_KEY }}
132+
91133
- name: Run E2E testing
92134
run: make test_e2e
93135
env:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ test_live_integration: install
9595
test_unit: install
9696
yarn typecheck
9797
yarn lint
98-
cfn-lint cloudformation/**/* --ignore-templates cloudformation/phony-swagger.yml
98+
cfn-lint cloudformation/**/* --ignore-templates cloudformation/phony-swagger.yml -i W3660
9999
yarn prettier
100100
yarn test:unit
101101

0 commit comments

Comments
 (0)