Skip to content

Commit 2fb5882

Browse files
author
Ahmad Nassri
committed
chore(template): sync with ahmadnassri/template-action-docker
1 parent 258b3a8 commit 2fb5882

File tree

6 files changed

+15
-19
lines changed

6 files changed

+15
-19
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ updates:
3939
interval: daily
4040
time: "10:00"
4141
timezone: America/Toronto
42-
42+
4343
- package-ecosystem: npm
4444
open-pull-requests-limit: 10
4545
directory: /action

.github/linters/.commit-lint.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44

55
extends:
66
- "@commitlint/config-conventional"
7+
78
rules:
8-
body-max-line-length: [2, 'always', 200]
9+
body-max-line-length: [2, "always", 200]

.github/linters/.markdown-lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ MD022:
6464
lines_above: 1
6565
lines_below: 1
6666

67-
6867
# Headings must start at the beginning of the line
6968
MD023: true
7069

.github/workflows/pull_request_target.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
repository_is_template: ${{ steps.metadata.outputs.repository_is_template }}
2222

2323
steps:
24-
- uses: actions/checkout@v3.1.0
24+
- uses: actions/checkout@v3.2.0
2525

2626
- uses: ahmadnassri/[email protected]
2727
id: metadata
@@ -43,13 +43,9 @@ jobs:
4343
- name: auto merge conditions
4444
id: auto-merge
4545
if: |
46-
(
47-
steps.dependabot.outputs.update-type == 'version-update:semver-patch' &&
48-
contains('direct:development,indirect:development,direct:production,indirect:production', steps.dependabot.outputs.dependency-type)
49-
) || (
50-
steps.dependabot.outputs.update-type == 'version-update:semver-minor' &&
51-
contains('direct:development,indirect:development', steps.dependabot.outputs.dependency-type)
52-
)
46+
contains('version-update:semver-minor,version-update:semver-patch', steps.dependabot.outputs.update-type) &&
47+
contains('direct:development,indirect:development,direct:production,indirect:production', steps.dependabot.outputs.dependency-type)
48+
5349
run: echo "::notice ::auto-merge conditions satisfied"
5450

5551
- name: auto approve pr
@@ -72,7 +68,7 @@ jobs:
7268
if: ${{ needs.metadata.outputs.repository_is_template == 'true' }}
7369

7470
steps:
75-
- uses: actions/checkout@v3.1.0
71+
- uses: actions/checkout@v3.2.0
7672
with:
7773
ref: ${{ github.event.pull_request.head.ref }}
7874

.github/workflows/push.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: ahmadnassri/[email protected]
2828

2929
- id: image
30-
run: echo "name=$(basename "${GITHUB_REPOSITORY/docker-//}")" >> "$GITHUB_OUTPUT"
30+
run: echo "name=$(basename "${GITHUB_REPOSITORY/docker-//}")" >> $GITHUB_OUTPUT
3131

3232
commit-lint:
3333
timeout-minutes: 5
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
- uses: actions/[email protected]
3939

40-
- uses: ahmadnassri/[email protected].4
40+
- uses: ahmadnassri/[email protected].3
4141
with:
4242
config: .github/linters/.commit-lint.yml
4343

@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/[email protected]
5151

52-
- uses: oxsecurity/megalinter/flavors/javascript@v6.15.0
52+
- uses: oxsecurity/megalinter/flavors/javascript@v6
5353
env:
5454
GITHUB_TOKEN: ${{ github.token }}
5555
MEGALINTER_CONFIG: .github/linters/.mega-linter.yml
@@ -102,7 +102,7 @@ jobs:
102102
- release
103103
- metadata
104104

105-
timeout-minutes: 5
105+
timeout-minutes: 10
106106

107107
if: ${{ needs.release.outputs.published == 'true' }}
108108

@@ -128,7 +128,7 @@ jobs:
128128
push: true
129129
cache-from: type=gha
130130
cache-to: type=gha,mode=max
131-
platforms: linux/amd64,linux/arm64
131+
platforms: linux/amd64
132132
tags: |
133133
ghcr.io/${{ github.repository_owner }}/${{ needs.metadata.outputs.image-name }}:latest
134134
ghcr.io/${{ github.repository_owner }}/${{ needs.metadata.outputs.image-name }}:${{ needs.release.outputs.version-major }}

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
# ---- mega-linter ---- #
77
lint:
88
profiles: ["dev"]
9-
image: oxsecurity/megalinter-javascript:v6.15.0
9+
image: oxsecurity/megalinter-javascript:v6
1010
volumes:
1111
- ./:/tmp/lint
1212
environment:
@@ -17,7 +17,7 @@ services:
1717
# ---- readme generator ---- #
1818
readme:
1919
profiles: ["dev"]
20-
image: pandoc/minimal:2.19
20+
image: pandoc/minimal:2.18.0
2121
volumes:
2222
- ./:/data
2323
command: --defaults=.pandoc.yml

0 commit comments

Comments
 (0)