Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Update CI #146

Merged
merged 4 commits into from
Dec 18, 2024
Merged

Feat: Update CI #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7da0213
feat: update hadolint-action version
Totto16 Dec 17, 2024
ddc968e
fix: use ubuntu-24.04 as image
Totto16 Dec 17, 2024
e75a832
ci: make checks into errors instead of warnings
Totto16 Dec 17, 2024
e462b9e
fix: fix LegacyKeyValueFormat checks in docker files
Totto16 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:
build-smoke-test:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: ${{ matrix.ghc }}-${{ matrix.deb }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -68,7 +68,8 @@ jobs:
command: |
docker build --pull \
-t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
${{ matrix.ghc_minor }}/${{ matrix.deb }}
${{ matrix.ghc_minor }}/${{ matrix.deb }} \
--build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
- uses: actions/checkout@v4
with:
repository: docker-library/official-images
Expand All @@ -78,7 +79,7 @@ jobs:

emulated-architecture-tests:
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: ${{ matrix.arch }}-${{ matrix.ghc }}-${{ matrix.deb }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -135,7 +136,8 @@ jobs:
docker build --pull --progress=plain \
--platform "linux/${{ matrix.docker_platform }}" \
-t haskell:${{ matrix.ghc }}-${{ matrix.deb }} \
${{ matrix.ghc_minor }}/${{ matrix.deb }}
${{ matrix.ghc_minor }}/${{ matrix.deb }} \
--build-arg "BUILDKIT_DOCKERFILE_CHECK=skip=SecretsUsedInArgOrEnv;error=true"
echo 'testing..'
docker run \
--platform "linux/${{ matrix.docker_platform }}" \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on:

jobs:
hadolint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: hadolint/hadolint-action@v1.6.0
- uses: hadolint/hadolint-action@v3.1.0
with:
recursive: true
4 changes: 2 additions & 2 deletions 9.0/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM buildpack-deps:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# additional haskell specific deps
RUN apt-get update && \
Expand Down Expand Up @@ -132,6 +132,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.0/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -148,6 +148,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.10/bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -129,6 +129,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.10/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -129,6 +129,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.10/slim-bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -129,6 +129,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.10/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -131,6 +131,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.2/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM buildpack-deps:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# additional haskell specific deps
RUN apt-get update && \
Expand Down Expand Up @@ -115,6 +115,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.2/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -131,6 +131,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.4/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM buildpack-deps:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# additional haskell specific deps
RUN apt-get update && \
Expand Down Expand Up @@ -115,6 +115,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.4/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -131,6 +131,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.6/bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -132,6 +132,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.6/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM buildpack-deps:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# additional haskell specific deps
RUN apt-get update && \
Expand Down Expand Up @@ -115,6 +115,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.6/slim-bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -134,6 +134,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.6/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -131,6 +131,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.8/bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -129,6 +129,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.8/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM buildpack-deps:buster

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# additional haskell specific deps
RUN apt-get update && \
Expand Down Expand Up @@ -115,6 +115,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.8/slim-bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -129,6 +129,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]
4 changes: 2 additions & 2 deletions 9.8/slim-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ENV LANG C.UTF-8
ENV LANG=C.UTF-8

# common haskell + stack dependencies
RUN apt-get update && \
Expand Down Expand Up @@ -131,6 +131,6 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
ENV PATH=/root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH

CMD ["ghci"]