Skip to content

Commit

Permalink
Merge branch 'main' into releases/v2
Browse files Browse the repository at this point in the history
  • Loading branch information
chrnorm committed Feb 7, 2024
2 parents d42cde7 + 04d8507 commit 7953996
Show file tree
Hide file tree
Showing 9 changed files with 3,104 additions and 6,857 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/check-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ on:
branches:
- main
paths-ignore:
- "**.md"
- '**.md'
pull_request:
paths-ignore:
- "**.md"
- '**.md'
workflow_dispatch:

jobs:
Expand All @@ -23,10 +23,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set Node.js 16.x
uses: actions/setup-node@v2.5.1
- name: Set Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Install dependencies
run: npm ci
Expand All @@ -45,7 +45,7 @@ jobs:
id: diff

# If index.js was different than expected, upload the expected version as an artifact
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
with:
name: dist
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: 'CodeQL'

on:
push:
Expand All @@ -18,7 +18,7 @@ on:
# The branches below must be a subset of the branches above
branches: [main]
schedule:
- cron: "31 7 * * 3"
- cron: '31 7 * * 3'

jobs:
analyze:
Expand All @@ -32,17 +32,17 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ["TypeScript"]
language: ['TypeScript']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
source-root: src
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
build: # make sure build/ci work properly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: |
npm install
- run: |
npm run all
test: # make sure the action works on a clean machine without building
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ./
with:
token: '${{ github.token }}'
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
deployments: write

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4

- uses: chrnorm/deployment-action@v2
name: Create GitHub deployment
Expand Down Expand Up @@ -136,3 +136,19 @@ jobs:
## Breaking changes
`v2` of this action removes the `target_url` input and replaces it with the `environment_url` and `log_url` inputs to match GitHub's API. `v2` also standardises on using `kebab-case` rather than `snake_case` for inputs to match GitHub's built-in actions.

## Releasing

1. Merge the main branch into `releases/v2`

2. Tag the release

```sh
git tag v2.0.6
git tag v2 -f # force update the existing v2 major release tag
```

3. Push the tags
```sh
git push -f --tags
```
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ outputs:
environment_url:
description: 'The environment URL of the deployment'
runs:
using: 'node16'
using: node20
main: 'dist/index.js'
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ module.exports = {
'^.+\\.ts$': 'ts-jest'
},
verbose: true
}
}
Loading

0 comments on commit 7953996

Please sign in to comment.