Skip to content

Commit 4bea433

Browse files
committed
fix(hadolint)
closes #10371 closes #10372
1 parent d6363a3 commit 4bea433

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed
Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
distributable:
2-
url: https://github.com/hadolint/hadolint/archive/v{{version}}.tar.gz
2+
url: https://github.com/hadolint/hadolint/archive/{{version.tag}}.tar.gz
33
strip-components: 1
44

55
versions:
66
github: hadolint/hadolint
7-
strip: /^v/
87

98
build:
109
dependencies:
11-
haskell.org: ~9.2
10+
haskell.org: ~9.10 # as of 2.13.1
1211
haskell.org/cabal: ^3
1312
git-scm.org: ^2 # cabal needs it for this one
1413
env:
1514
ARGS:
1615
- --jobs={{hw.concurrency}}
1716
- --install-method=copy
1817
- --installdir={{prefix}}/bin
19-
script: |
20-
cabal v2-update
21-
cabal v2-install $ARGS
18+
script:
19+
# FIXME: this isn't great, but it'll fix any ghc install at build time
20+
# needs install-time customization for a true fix
21+
- run: grep -q 'rpath,{{pkgx.prefix}}' settings || sed -i -f $PROP settings
22+
prop: s|\(C compiler link flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|
23+
if: darwin
24+
working-directory: ${{deps.haskell.org.prefix}}/.ghcup/ghc/{{deps.haskell.org.version}}/lib/ghc-{{deps.haskell.org.version}}/lib
25+
26+
- cabal v2-update
27+
- cabal v2-install $ARGS
2228

2329
provides:
2430
- bin/hadolint
2531

2632
test:
27-
fixture: |
28-
FROM debian
29-
script: |
30-
hadolint --version | grep {{version}}
31-
echo $(hadolint $FIXTURE || true) | grep DL3006
33+
script:
34+
- hadolint --version | grep {{version}}
35+
- run: echo $(hadolint $FIXTURE || true) | grep DL3006
36+
fixture: |
37+
FROM debian

0 commit comments

Comments
 (0)