Skip to content

Commit 9699a90

Browse files
committed
Better CI pattern
1 parent 5f8acc1 commit 9699a90

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

.github/workflows/ci.yml renamed to .github/workflows/debian.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Validate Docker
1+
name: Validate Debian
22

33
on:
44
pull_request:
55
branches:
66
- master
77
paths:
8-
- '**/Dockerfile'
9-
- '.github/workflows/**'
8+
- '**/buster/Dockerfile'
9+
- '.github/workflows/debian.yml'
1010

1111
jobs:
1212
build-smoke-test:
@@ -38,19 +38,12 @@ jobs:
3838
${{ matrix.ghc_minor }}/${{ matrix.deb }}
3939
- uses: actions/checkout@v2
4040
with:
41-
repository: docker-library/official-images
41+
repository: AlistairB/official-images
42+
ref: haskell-sh
4243
path: official-images
4344
- name: run official-images tests
4445
run: ./official-images/test/run.sh haskell:${{ matrix.ghc }}-${{ matrix.deb }}
4546

46-
hadolint:
47-
runs-on: ubuntu-latest
48-
steps:
49-
- uses: actions/checkout@v2
50-
- uses: hadolint/[email protected]
51-
with:
52-
recursive: true
53-
5447
emulated-architecture-tests:
5548
timeout-minutes: 60
5649
runs-on: ubuntu-latest

.github/workflows/lint.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Hadolint
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
paths:
8+
- '**/Dockerfile'
9+
- '.github/workflows/lint.yml'
10+
11+
jobs:
12+
hadolint:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: hadolint/[email protected]
17+
with:
18+
recursive: true

.hadolint.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ ignored:
22
# https://github.com/hadolint/hadolint/wiki/DL3008
33
# Don't want to micro manage the dependency versions.
44
- DL3008
5+
- DL3018
56
# https://github.com/hadolint/hadolint/wiki/DL3003
67
# Using cd /tmp is a very convenient way to clean up after a step.
78
- DL3003

0 commit comments

Comments
 (0)