Skip to content

Commit

Permalink
Merge pull request #19 from BrownUniversity/chore-update-2023
Browse files Browse the repository at this point in the history
Chore: update dependency versions
  • Loading branch information
digicosmos86 authored Jul 19, 2023
2 parents 0098d6e + 9c125a8 commit c6b2df2
Show file tree
Hide file tree
Showing 22 changed files with 122 additions and 780 deletions.
89 changes: 44 additions & 45 deletions .github/workflows/kitchen-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: kitchen-tests
on:
push:
branches:
- 'main'
- "main"
tags:
- 'v*.*.*'
pull_request:
- "v*.*.*"
pull_request:
branches:
- 'main'
- "main"

env:
REGISTRY: ghcr.io
Expand All @@ -17,16 +17,16 @@ env:
jobs:
docker:
runs-on: ubuntu-latest

permissions:
packages: write
contents: read

outputs:
full_image_id: ${{ steps.save_full_image_id.outputs.full_image_id }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: dorny/[email protected]
id: filter
Expand Down Expand Up @@ -63,13 +63,13 @@ jobs:
# NOTE: We are tapping into json output because tags could become a list if prior step is modified
- id: save_full_image_id
run: echo "::set-output name=full_image_id::${{ fromJSON(steps.meta.outputs.json).tags[0] }}"
run: echo "full_image_id=${{ fromJSON(steps.meta.outputs.json).tags[0] }}" >> $GITHUB_OUTPUT

- name: print_tag
run: echo "${{ fromJSON(steps.meta.outputs.json).tags[0] }}"

- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
push: true
Expand All @@ -78,51 +78,50 @@ jobs:
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache


simple-cluster:
needs: [docker]
if: "!contains(github.event.commits[0].message, '[skip ci]')"
runs-on: ubuntu-latest
container:
image: "${{ needs.docker.outputs.full_image_id }}"
steps:
- uses: actions/checkout@v2
- name: Create Credential File
run: |
echo "$GCP_CREDENTIAL_JSON" | base64 -d > /tmp/credentials.json
env:
GCP_CREDENTIAL_JSON: ${{ secrets.GCP_CI_CREDENTIAL_JSON}}
- name: Run Kitchen
run: kitchen test simple-cluster
env:
TF_VAR_billing_account: ${{ secrets.GCP_BURWOOD_BILLING_ACCOUNT }}
TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}
TF_VAR_folder_id: ${{ secrets.GCP_CCV_CI_FOLDER_ID }}
TF_VAR_network_name: "network-01"
TF_VAR_subnet_name: "subnet-01"
TF_VAR_routing_mode: "REGIONAL"
GOOGLE_APPLICATION_CREDENTIALS: /tmp/credentials.json
- uses: actions/checkout@v3
- name: Create Credential File
run: |
echo "$GCP_CREDENTIAL_JSON" | base64 -d > /tmp/credentials.json
env:
GCP_CREDENTIAL_JSON: ${{ secrets.GCP_CI_CREDENTIAL_JSON}}
- name: Run Kitchen
run: kitchen test simple-cluster
env:
TF_VAR_billing_account: ${{ secrets.GCP_BURWOOD_BILLING_ACCOUNT }}
TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}
TF_VAR_folder_id: ${{ secrets.GCP_CCV_CI_FOLDER_ID }}
TF_VAR_network_name: "network-01"
TF_VAR_subnet_name: "subnet-01"
TF_VAR_routing_mode: "REGIONAL"
GOOGLE_APPLICATION_CREDENTIALS: /tmp/credentials.json

brown-modules:
needs: [docker]
if: "!contains(github.event.commits[0].message, '[skip ci]')"
runs-on: ubuntu-latest
container:
image: "${{ needs.docker.outputs.full_image_id }}"
image: "${{ needs.docker.outputs.full_image_id }}"
steps:
- uses: actions/checkout@v2
- name: Create Credential File
run: |
echo "$GCP_CREDENTIAL_JSON" | base64 -d > /tmp/credentials.json
env:
GCP_CREDENTIAL_JSON: ${{ secrets.GCP_CI_CREDENTIAL_JSON}}
- name: Run Kitchen
run: kitchen test brown-modules-cluster
env:
TF_VAR_billing_account: ${{ secrets.GCP_BURWOOD_BILLING_ACCOUNT }}
TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}
TF_VAR_folder_id: ${{ secrets.GCP_CCV_CI_FOLDER_ID }}
TF_VAR_network_name: "network-01"
TF_VAR_subnet_name: "subnet-01"
TF_VAR_routing_mode: "REGIONAL"
GOOGLE_APPLICATION_CREDENTIALS: /tmp/credentials.json
- uses: actions/checkout@v3
- name: Create Credential File
run: |
echo "$GCP_CREDENTIAL_JSON" | base64 -d > /tmp/credentials.json
env:
GCP_CREDENTIAL_JSON: ${{ secrets.GCP_CI_CREDENTIAL_JSON}}
- name: Run Kitchen
run: kitchen test brown-modules-cluster
env:
TF_VAR_billing_account: ${{ secrets.GCP_BURWOOD_BILLING_ACCOUNT }}
TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}
TF_VAR_folder_id: ${{ secrets.GCP_CCV_CI_FOLDER_ID }}
TF_VAR_network_name: "network-01"
TF_VAR_subnet_name: "subnet-01"
TF_VAR_routing_mode: "REGIONAL"
GOOGLE_APPLICATION_CREDENTIALS: /tmp/credentials.json
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.74.1 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
rev: v1.81.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
hooks:
- id: terraform_fmt
- id: terraform_docs
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
3.2.2
2 changes: 1 addition & 1 deletion .terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.5
1.5.0
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
terraform 1.2.5
ruby 3.1.2
terraform 1.5.0
ruby 3.2.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hashicorp/terraform:1.2.5
FROM hashicorp/terraform:1.5.0

COPY .ruby-version .ruby-version

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "https://rubygems.org/" do
gem "kitchen-terraform", "~> 6.1.0"
gem "kitchen-terraform", "~> 7.0.0"
end
Loading

0 comments on commit c6b2df2

Please sign in to comment.