cleaning up after others.

.github/actions/docker-checks/action.yml

@@ -30,5 +30,4 @@ runs:
       run: |
         hadolint docker/ci/github/Dockerfile && \
         hadolint docker/ci/arch/Dockerfile && \
-        hadolint docker/ci/alpine/Dockerfile && \
-        hadolint docker/ci/centos/Dockerfile
+        hadolint docker/ci/alpine/Dockerfile

.github/workflows/ci-test.yml

@@ -128,8 +128,9 @@ jobs:
     needs: prepare
     if: ${{ needs.prepare.outputs.test-dev-setup == 'true' }}
     strategy:
+      fail-fast: false
       matrix:
-        target_os: [alpine, centos, arch, github]
+        target_os: [alpine, arch, github]
     steps:
       - uses: actions/[email protected]
         with:

docker/ci/alpine/Dockerfile

@@ -8,7 +8,7 @@ COPY scripts/dev_setup.sh /diem/scripts/dev_setup.sh
 RUN apk add bash=5.1.0-r0 --no-cache
 
 # Batch mode and all operations tooling
-RUN scripts/dev_setup.sh -t -o -y -b -p
+RUN scripts/dev_setup.sh -t -o -y -b -p -s
 ENV PATH "/root/.cargo/bin:/root/bin/:$PATH"
 
 FROM setup_ci_alpine as tested_ci_alpine
@@ -27,10 +27,19 @@ RUN [ -x "$(command -v shellcheck)" ] \
     && [ -x "$(command -v helm)" ] \
     && [ -x "$(command -v aws)" ] \
     && [ -x "$(command -v z3)" ] \
+    && [ -x "$(command -v tidy)" ] \
+    && [ -x "$(command -v xsltproc)" ] \
     && [ -x "$(command -v "$HOME/.dotnet/tools/boogie")" ] \
-    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ]
+    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ] \
+    && [ -x "$(command -v tidy)" ] \
+    && [ -x "$(command -v xsltproc)" ] \
+    && [ -x "$(command -v javac)" ] \
+    && [ -x "$(command -v clang)" ] \
+    && [ -x "$(command -v python3)" ] \
+    && [ -x "$(command -v go)" ] \
+    && [ -x "$(command -v npm)" ]
 
 # should be a no-op, but since sccache failes to execute, sccache is rebuilt.
-#RUN scripts/dev_setup.sh -b -p
+RUN scripts/dev_setup.sh -t -o -y -b -p -s
 
 FROM setup_ci_alpine as build_environment_alpine

docker/ci/arch/Dockerfile

@@ -33,9 +33,17 @@ RUN [ -x "$(command -v shellcheck)" ] \
     && [ -x "$(command -v aws)" ] \
     && [ -x "$(command -v z3)" ] \
     && [ -x "$(command -v "$HOME/.dotnet/tools/boogie")" ] \
-    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ]
+    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ] \
+    && [ -x "$(command -v tidy)" ] \
+    && [ -x "$(command -v xsltproc)" ]
+# These should eventually be installed and tested, but since we don't automate on arch, low pri.
+# && [ -x "$(command -v javac)" ] \
+# && [ -x "$(command -v clang)" ] \
+# && [ -x "$(command -v python3)" ] \
+# && [ -x "$(command -v go)" ] \
+# && [ -x "$(command -v npm)" ]
 
 # should be a no-op
-RUN scripts/dev_setup.sh -b -p
+RUN scripts/dev_setup.sh -t -o -y -b -p
 
 FROM setup_ci_arch as build_environment_arch

docker/ci/github/Dockerfile

@@ -39,16 +39,18 @@ RUN [ -x "$(command -v shellcheck)" ] \
     && [ -x "$(command -v helm)" ] \
     && [ -x "$(command -v aws)" ] \
     && [ -x "$(command -v z3)" ] \
+    && [ -x "$(command -v "$HOME/.dotnet/tools/boogie")" ] \
+    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ] \
+    && [ -x "$(command -v tidy)" ] \
+    && [ -x "$(command -v xsltproc)" ] \
     && [ -x "$(command -v javac)" ] \
     && [ -x "$(command -v clang)" ] \
     && [ -x "$(command -v python3)" ] \
     && [ -x "$(command -v go)" ] \
-    && [ -x "$(command -v npm)" ] \
-    && [ -x "$(command -v "$HOME/.dotnet/tools/boogie")" ] \
-    && [ -x "$(xargs rustup which cargo --toolchain < /diem/rust-toolchain )" ]
+    && [ -x "$(command -v npm)" ]
 
 # should be a no-op
 # sccache builds fine, but is not executable ??? in alpine, ends up being recompiled.  Wierd.
-RUN /diem/scripts/dev_setup.sh -b -p -s
+RUN /diem/scripts/dev_setup.sh -t -o -y -b -p -s
 
 FROM setup_ci as build_environment