Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
todd-hagler committed Nov 2, 2022
2 parents 8c16c39 + 505adf3 commit bb82e06
Show file tree
Hide file tree
Showing 111 changed files with 9,779 additions and 15,395 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.2
FROM node:14 as build
FROM node:16 as build
WORKDIR /lambda
RUN apt-get update \
&& apt-get install -y zip \
Expand Down
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
runs-on: ubuntu-latest
steps:
- uses: hmarr/auto-approve-action@v2.2.1
- uses: hmarr/auto-approve-action@v3.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/lambda-runner-binaries-syncer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16]
node: [16]
container:
image: node:${{ matrix.node }}
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda-runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16]
node: [16]
container:
image: node:${{ matrix.node }}
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16]
node: [16]
container:
image: node:${{ matrix.node }}
defaults:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
prepare:
name: Create dist
runs-on: ubuntu-latest
container: node:14
container: node:16
strategy:
matrix:
lambda: ["modules/webhook/lambdas/webhook", "modules/runner-binaries-syncer/lambdas/runner-binaries-syncer", "modules/runners/lambdas/runners"]
Expand All @@ -20,7 +20,7 @@ jobs:
id: lambda
env:
LAMBDA: ${{ matrix.lambda }}
run: echo ::set-output name=name::${LAMBDA##*/}
run: echo "name=${LAMBDA##*/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v3
- name: Add zip
run: apt update && apt install zip
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:

steps:
- name: Generate provenance for release
uses: philips-labs/slsa-provenance-action@v0.7.2
uses: philips-labs/slsa-provenance-action@v0.8.0
with:
artifact_path: release-assets
output_path: 'build.provenance'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semantic-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: amannn/action-semantic-pull-request@v4
- uses: amannn/action-semantic-pull-request@v5
name: Check PR for Semantic Commit Message
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v5
- uses: actions/stale@v6
with:
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
Expand All @@ -25,3 +25,4 @@ jobs:
days-before-stale: 30
days-before-close: 10
close-issue-label: "abandoned"
exempt-issue-labels: "stale:exempt"
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: git://github.com/antonbabenko/pre-commit-terraform
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.52.0
hooks:
- id: terraform_fmt
- id: terraform_tflint
- id: terraform_docs
- repo: git://github.com/pre-commit/pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
- id: check-merge-conflict
6 changes: 3 additions & 3 deletions .release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^8.0.2",
"@semantic-release/github": "^8.0.6",
"@semantic-release/release-notes-generator": "^10.0.3",
"conventional-changelog-conventionalcommits": "^4.6.3",
"semantic-release": "^19.0.2"
"conventional-changelog-conventionalcommits": "^5.0.0",
"semantic-release": "^19.0.5"
}
}
Loading

0 comments on commit bb82e06

Please sign in to comment.