Skip to content

Commit

Permalink
Revert "Include AL2023 ami for CI testing (#1413)"
Browse files Browse the repository at this point in the history
This reverts commit c6a306d.
  • Loading branch information
Kausik-A authored Sep 21, 2023
1 parent c6a306d commit 2c406da
Show file tree
Hide file tree
Showing 36 changed files with 1,141 additions and 1,221 deletions.
6 changes: 2 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ updates:
patterns:
- "*"
ignore:
- dependency-name: "com.github.fge:json-schema-validator"
- dependency-name: "json-schema-validator"
update-types:
- "version-update:semver-major"
- "version-update:semver-minor"
- dependency-name: "com.github.johnrengelman.shadow"
update-types:
- "version-update:semver-major"


- package-ecosystem: "gradle"
# build.gradle stored in `/load-generator` directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cdk-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
run-cdk-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: ${{ secrets.TEST_FW_ASSUMABLE_ROLE_ARN }}
aws-region: us-west-2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
- name: Format Terraform
run: cd terraform && make check-fmt

Expand All @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: ${{ secrets.INTEG_TEST_TFW_ROLE_ARN }}
role-duration-seconds: 1200
aws-region: us-east-1
- name: Login to ECR
uses: docker/login-action@v3
uses: docker/login-action@v2
with:
registry: public.ecr.aws
- name: Push validator docker image
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
validator-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
Expand All @@ -26,11 +26,11 @@ jobs:
validator-image-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v2
- name: Build validator image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v4
with:
context: ./validator
push: false
Expand All @@ -44,16 +44,16 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: '~1.21.1'
go-version: '~1.18.6'
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v3
- name: Unit test
run: make go-test
cdk-test:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-load-generator-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v3
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: ${{ secrets.TEST_FW_ASSUMABLE_ROLE_ARN }}
aws-region: us-east-1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
run-image-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: ${{ secrets.TEST_FW_ASSUMABLE_ROLE_ARN }}
aws-region: us-west-2
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
plugins {
// Apply the java plugin to add support for Java
id 'java'
id 'com.github.ben-manes.versions' version '0.48.0'
id 'com.github.ben-manes.versions' version '0.47.0'
id 'se.patrikerdes.use-latest-versions' version '0.2.18'

}
Expand All @@ -20,7 +20,7 @@ repositories {

dependencies {
// This dependency is used by the application.
implementation 'com.google.guava:guava:32.1.2-jre'
implementation 'com.google.guava:guava:32.0.0-jre'

// Use JUnit test framework
testImplementation 'junit:junit:4.13.2'
Expand Down
Loading

0 comments on commit 2c406da

Please sign in to comment.