Skip to content

Commit

Permalink
Merge pull request #647 from morucci/f35-api
Browse files Browse the repository at this point in the history
Use Fedora 35 as base image to benefit GHC 8.10
  • Loading branch information
morucci authored Oct 12, 2021
2 parents 72dbd4f + df61cd7 commit f40dbcd
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/publish-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ jobs:
if: github.repository_owner == 'change-metrics'
runs-on: ubuntu-latest
steps:
# See https://github.com/actions/virtual-environments/issues/3812 for more information
- name: Download Docker with patched seccomp
run: |
sudo systemctl stop docker containerd
sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
sudo apt-get install -y docker.io
- name: Checkout code
uses: actions/checkout@v2
with:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/publish-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ jobs:
if: github.repository_owner == 'change-metrics'
runs-on: ubuntu-latest
steps:
# See https://github.com/actions/virtual-environments/issues/3812 for more information
- name: Download Docker with patched seccomp
run: |
sudo systemctl stop docker containerd
sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
sudo apt-get install -y docker.io
- name: Checkout code
uses: actions/checkout@v2
with:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/validate-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,17 @@ jobs:
- name: Test with tox
run: tox -e py3

# - name: Validate usefulness of tests
# uses: quality-of-tests/has-useful-tests-action@master
# with:
# run-tests: tox -epy3
docker:
runs-on: ubuntu-latest
steps:
# See https://github.com/actions/virtual-environments/issues/3812 for more information
- name: Download Docker with patched seccomp
run: |
sudo systemctl stop docker containerd
sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
sudo apt-get install -y docker.io
- name: Checkout code
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-api
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ COPY haskell/ /build
RUN cabal v2-install -v1 exe:monocle-api exe:macroscope

################################################################################
FROM registry.fedoraproject.org/fedora:33
FROM registry.fedoraproject.org/fedora:35

COPY --from=0 /root/.cabal/bin/monocle-api /root/.cabal/bin/macroscope /bin/

0 comments on commit f40dbcd

Please sign in to comment.