Skip to content

Commit

Permalink
Merge pull request #907 from splunk/CI_Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
josehelps committed Jul 3, 2024
2 parents 30f96c0 + 29b5a26 commit 3befca3
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ updates:
interval: daily
time: "14:00"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
8 changes: 4 additions & 4 deletions .github/workflows/build_attack_destroy_aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
steps:

- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install System Packages
run: |
sudo apt update -qq
sudo apt install -y openssh-client
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

- uses: aws-actions/configure-aws-credentials@v1
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -36,7 +36,7 @@ jobs:
known_hosts: unnecessary
if_key_exists: fail

- uses: hashicorp/setup-terraform@v1
- uses: hashicorp/setup-terraform@v3

- name: Install Packer
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_attack_destroy_azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
steps:

- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install System Packages
run: |
sudo apt update -qq
sudo apt install -y openssh-client
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

- uses: Azure/login@v1
- uses: Azure/login@v2
with:
creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}'

Expand All @@ -38,7 +38,7 @@ jobs:
run: |
echo ${{ secrets.AR_SSH_PUBLIC_KEY }} > ~/.ssh/ar-github-actions.pub
- uses: hashicorp/setup-terraform@v1
- uses: hashicorp/setup-terraform@v3

- name: Install Packer
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/destroy_old_attack_ranges.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:
steps:

- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install System Packages
run: |
sudo apt update -qq
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

- uses: aws-actions/configure-aws-credentials@v1
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'

- 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

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: docker/
platforms: linux/amd64,linux/arm64
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v')
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: 'develop'

Expand All @@ -60,7 +60,7 @@ jobs:
#Upload all of the release artifacts that we have created using the third party
#action recommended bu Github
- name: Upload Release Artifacts
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
../attack-range-${{ steps.vars.outputs.tag }}.tar.gz
Expand All @@ -75,18 +75,18 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v')
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: 'develop'

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Setup Docker Build and Push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
context: docker/ #do the build in the docker directory, not current working directory
Expand Down

0 comments on commit 3befca3

Please sign in to comment.