Skip to content

Commit 4e66e3a

Browse files
committed
Merge branch 'master' into next
2 parents bb722d8 + 1e40365 commit 4e66e3a

File tree

7 files changed

+1560
-3293
lines changed

7 files changed

+1560
-3293
lines changed

.github/workflows/docker-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444

4545
# Login against a Docker registry except on PR
4646
# https://github.com/docker/login-action
4747
- name: Log into registry ${{ env.REGISTRY }}
4848
if: github.event_name != 'pull_request'
49-
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
49+
uses: docker/login-action@v2
5050
with:
5151
registry: ${{ env.REGISTRY }}
5252
username: ${{ github.actor }}
@@ -56,7 +56,7 @@ jobs:
5656
# https://github.com/docker/metadata-action
5757
- name: Extract Docker metadata
5858
id: meta
59-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
59+
uses: docker/metadata-action@v4
6060
with:
6161
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
6262
tags: |
@@ -70,7 +70,7 @@ jobs:
7070
# Build and push Docker image with Buildx (don't push on PR)
7171
# https://github.com/docker/build-push-action
7272
- name: Build and push Docker image
73-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
73+
uses: docker/build-push-action@v3
7474
with:
7575
context: .
7676
push: ${{ github.event_name != 'pull_request' }}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Version Increment on security and maintenance release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
logLevel:
7+
description: 'Log level'
8+
required: true
9+
default: 'warning'
10+
tags:
11+
description: 'Security release'
12+
13+
jobs:
14+
version:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
with:
19+
token: ${{ secrets.GH_PUSH_TO_GIT }}
20+
- run: git config --global user.name 'Fails maintenance bot'
21+
- run: git config --global user.email '[email protected]'
22+
- run: npm version patch
23+
- run: git push --tags
24+
- run: git push

0 commit comments

Comments
 (0)