Skip to content

Commit

Permalink
adjust guthub action
Browse files Browse the repository at this point in the history
  • Loading branch information
daknhh committed Apr 13, 2024
1 parent 4a8c12a commit f279262
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/waf_test_ipSets.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: IpSet-Firewall


env:
AWS_REGION: eu-central-1
AWS_ROLE: FirewallFactoryGithubPipelineRole
Expand All @@ -9,16 +10,15 @@ permissions:
id-token: write
contents: read

concurrency: ci-${{ github.ref }}
concurrency:
group: test_envrionment
cancel-in-progress: true

on:
push:
branches:
- master
paths:
- 'bin/**/*'
- 'lib/**/*'
- 'package*.json'
- pullrequests/vboufleur/fix/several
pull_request:
branches:
- master
Expand All @@ -37,9 +37,9 @@ jobs:
run: |
npm install -g @go-task/cli
- name: ☊ Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '18.x'
node-version: '21.x'
- name: 💾 Cache Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -50,13 +50,13 @@ jobs:
${{ runner.OS }}-
- name: 🌐 Install CDK and typescript globally
run: |
npm i -g aws-cdk typescript ts-node @types/node
npm i -g aws-cdk typescript ts-node @types/node yarn
npm link typescript
- name: 📦 Install Packages
run: |
npm install
- name: 🔑 Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1.7.0
uses: aws-actions/configure-aws-credentials@v4.0.2
env:
ACCOUNT_ID: ${{ env.AWS_ACCOUNT }}
with:
Expand All @@ -65,9 +65,9 @@ jobs:
role-session-name: GitHubActionsSession
mask-aws-account-id: false
- name: 🚀 Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: 🫙 Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.3.0
- name: 🔥 Deploy Firewall to AWS
run: |
task deploy config=ipSetsTests
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/waf_test_onlymanagedrulegroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ permissions:
id-token: write
contents: read

concurrency: ci-${{ github.ref }}
concurrency:
group: test_envrionment
cancel-in-progress: true

on:
push:
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/waf_test_regexPatternSets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,22 @@ permissions:
id-token: write
contents: read

concurrency: ci-${{ github.ref }}
concurrency:
group: test_envrionment
cancel-in-progress: true

on:
push:
branches:
- master
paths:
- 'bin/**/*'
- 'lib/**/*'
- 'package*.json'
- pullrequests/vboufleur/fix/several
pull_request:
branches:
- master
paths:
- 'bin/**/*'
- 'lib/**/*'
- 'package*.json'

jobs:
deploy_production_main:
name: Test and deploy RegexPatternSets Firewall
Expand All @@ -38,9 +36,9 @@ jobs:
run: |
npm install -g @go-task/cli
- name: ☊ Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '18.x'
node-version: '21.x'
- name: 💾 Cache Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -51,13 +49,13 @@ jobs:
${{ runner.OS }}-
- name: 🌐 Install CDK and typescript globally
run: |
npm i -g aws-cdk typescript ts-node @types/node
npm i -g aws-cdk typescript ts-node @types/node yarn
npm link typescript
- name: 📦 Install Packages
run: |
npm install
- name: 🔑 Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1.7.0
uses: aws-actions/configure-aws-credentials@v4.0.2
env:
ACCOUNT_ID: ${{ env.AWS_ACCOUNT }}
with:
Expand All @@ -66,9 +64,9 @@ jobs:
role-session-name: GitHubActionsSession
mask-aws-account-id: false
- name: 🚀 Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: 🫙 Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3.3.0
- name: 🔥 Deploy Firewall to AWS
run: |
task deploy config=regexPatternSetsTests
Expand Down

0 comments on commit f279262

Please sign in to comment.