Skip to content

Commit

Permalink
Merge branch 'philips-labs:develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
todd-hagler authored May 25, 2022
2 parents 67b63d9 + 68a2014 commit 817e33b
Show file tree
Hide file tree
Showing 92 changed files with 3,040 additions and 2,760 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ updates:
directory: "/modules/runners/lambdas/runners"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/.release"
schedule:
interval: "weekly"
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.1.0
- uses: hmarr/auto-approve-action@v2.2.1
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
6 changes: 5 additions & 1 deletion .github/workflows/lambda-runner-binaries-syncer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: node:14
strategy:
matrix:
node: [14, 16]
container:
image: node:${{ matrix.node }}
defaults:
run:
working-directory: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/lambda-runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: node:14
strategy:
matrix:
node: [14, 16]
container:
image: node:${{ matrix.node }}
defaults:
run:
working-directory: modules/runners/lambdas/runners
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/lambda-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: node:14
strategy:
matrix:
node: [14, 16]
container:
image: node:${{ matrix.node }}
defaults:
run:
working-directory: modules/webhook/lambdas/webhook
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packer-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Packer checks"
on:
push:
branches:
- master
- main
- develop
pull_request:
paths:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release build
on:
push:
branches:
- master
- main
- develop
workflow_dispatch:

Expand All @@ -27,7 +27,7 @@ jobs:
- name: Build dist
working-directory: ${{ matrix.lambda }}
run: yarn install && yarn run test && yarn dist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.lambda.outputs.name }}
path: ${{ matrix.lambda }}/${{ steps.lambda.outputs.name }}.zip
Expand All @@ -43,15 +43,15 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: webhook
path: artifacts
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: runners
path: artifacts
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: runner-binaries-syncer
path: artifacts
Expand All @@ -75,7 +75,7 @@ jobs:
yarn release -d --repositoryUrl https://x-access-token:[email protected]/$GITHUB_REPOSITORY.git
- name: Release
if: github.event_name != 'pull_request' && contains('refs/heads/master', github.ref)
if: github.event_name != 'pull_request' && contains('refs/heads/main', github.ref)
env:
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/semantic-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Semantic Check"

on:
pull_request_target:
types:
- opened
- edited
- synchronize

permissions:
contents: read
pull-requests: read

jobs:
main:
name: Semantic Commit Message Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: amannn/action-semantic-pull-request@v4
name: Check PR for Semantic Commit Message
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
requireScope: false
validateSingleCommit: true
ignoreLabels: release merge
27 changes: 27 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Stale issue and PR workflow"
on:
schedule:
- cron: "30 1 * * *"
workflow_dispatch:

permissions:
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v5
with:
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
activity in the last 30 days. It will be closed if no further activity occurs.
Thank you for your contributions.
stale-pr-message: >
This pull request has been automatically marked as stale because it has not had
activity in the last 30 days. It will be closed if no further activity occurs. Thank you
for your contributions.
days-before-stale: 30
days-before-close: 10
close-issue-label: "abandoned"
9 changes: 5 additions & 4 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Terraform checks"
on:
push:
branches:
- master
- main
- develop
pull_request:
paths-ignore:
Expand All @@ -15,7 +15,7 @@ jobs:
name: Verify module
strategy:
matrix:
terraform: [1.1.3, 'latest']
terraform: [1.1.3, "latest"]
runs-on: ubuntu-latest
container:
image: hashicorp/terraform:${{ matrix.terraform }}
Expand Down Expand Up @@ -44,8 +44,9 @@ jobs:
strategy:
fail-fast: false
matrix:
terraform: [1.0.11, 1.1.3, 'latest']
example: ["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
terraform: [1.0.11, 1.1.3, "latest"]
example:
["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
defaults:
run:
working-directory: examples/${{ matrix.example }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*id_rsa*

# other
node_modules/
.idea
.DS_Store
*.out
Expand All @@ -20,3 +21,5 @@ secrets.auto.tfvars
.vscode

**/coverage/*

node_modules/
2 changes: 1 addition & 1 deletion .release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"@semantic-release/github": "^8.0.2",
"@semantic-release/release-notes-generator": "^10.0.3",
"conventional-changelog-conventionalcommits": "^4.6.3",
"semantic-release": "^18.0.1"
"semantic-release": "^19.0.2"
}
}
Loading

0 comments on commit 817e33b

Please sign in to comment.