Disable rawhide container build until fix for actions/runner-images#3812

has been deployed
rcaelers · Aug 11, 2021 · d5a5cb1 · d5a5cb1
1 parent 28a2053
commit d5a5cb1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -13,17 +13,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - image: mingw-qt5
-          # - image: mingw-gtk
-          # - image: debian-testing
-          # - image: ubuntu-cowbuilder
-          # - image: ubuntu-impish
-          # - image: ubuntu-hirsute
-          # - image: ubuntu-groovy
-          # - image: ubuntu-focal-plus
-          # - image: ubuntu-focal
-          # - image: ubuntu-bionic
-          - image: mingw-gtk-rawhide
+          - image: mingw-qt5
+          - image: mingw-gtk
+          - image: debian-testing
+          - image: ubuntu-cowbuilder
+          - image: ubuntu-impish
+          - image: ubuntu-hirsute
+          - image: ubuntu-groovy
+          - image: ubuntu-focal-plus
+          - image: ubuntu-focal
+          - image: ubuntu-bionic
+          #- image: mingw-gtk-rawhide
 
     steps:
       - name: Checkout

diff --git a/mingw-gtk-rawhide/Dockerfile b/mingw-gtk-rawhide/Dockerfile
@@ -7,14 +7,10 @@ ENV WORKRAVE_CONTAINER_COMMIT=${GIT_COMMIT_HASH}
 RUN mkdir /workrave && \
     echo ${GIT_COMMIT_HASH} > /workrave/container-commit
 
-RUN echo "%_install_langs all" >/etc/rpm/macros.image-language-conf
-RUN     dnf clean all
-RUN     cat /etc/resolv.conf
-RUN     dnf -y update
-RUN     dnf -y install wget 
-RUN     wget "https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=x86_64"
-RUN     cat /etc/resolv.conf
-RUN     dnf -y install \
+RUN echo "%_install_langs all" >/etc/rpm/macros.image-language-conf && \
+    dnf clean all && \
+    dnf -y update && \
+    dnf -y install \
                 bzip2 \
                 clang \
                 cmake \
@@ -41,9 +37,8 @@ RUN     dnf -y install \
                 tar \
                 which \
                 wine-core.i686 \
-                xz
-RUN     cat /etc/resolv.conf
-RUN     dnf -y clean all
+                xz && \
+    dnf -y clean all
 
 RUN mkdir -p /workspace