Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/aws/jsii-ru…
Browse files Browse the repository at this point in the history
…ntime-go-1.104.0
  • Loading branch information
katallaxie authored Oct 15, 2024
2 parents 86de24a + 25846df commit cdb295e
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 25 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .github/workflows/automerge.yml

name: Dependabot (auto-merge)

on:
pull_request:
branches:
- main

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47 changes: 24 additions & 23 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ on:
workflow_call:
push:
branches:
- main
- release/*
- main
- release/*
pull_request:
branches:
- main
- main

jobs:
test:
runs-on: ubuntu-latest
permissions:
checks: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- run: make test
- uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Go Test Results
path: .test/reports/**-test.xml
reporter: java-junit
fail-on-error: 'true'
- uses: actions/upload-artifact@v3
if: success() || failure()
with:
name: Test Reports
path: .test/reports/**
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- run: make test
- uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: Go Test Results
path: .test/reports/**-test.xml
reporter: java-junit
fail-on-error: "true"
- uses: actions/upload-artifact@v3
if: success() || failure()
with:
name: Test Reports
path: .test/reports/**

lint:
runs-on: ubuntu-latest
Expand All @@ -47,16 +47,17 @@ jobs:
- run: make lint

deploy:
if: ${{ github.actor != 'dependabot[bot]' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 20

- run: npx cdktf-cli get

- uses: hashicorp/terraform-cdk-action@v5
Expand All @@ -65,4 +66,4 @@ jobs:
terraformVersion: 1.9.5
mode: auto-approve-apply
stackName: stack
githubToken: ${{ secrets.GITHUB_TOKEN }}
githubToken: ${{ secrets.GITHUB_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ jobs:
uses: ./.github/workflows/main.yml

plan:
if: ${{ github.actor != 'dependabot[bot]' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: 20
Expand All @@ -31,4 +32,4 @@ jobs:
terraformVersion: 1.9.5
mode: plan-only
stackName: stack
githubToken: ${{ secrets.GITHUB_TOKEN }}
githubToken: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit cdb295e

Please sign in to comment.