Update CI to use new shared SSL docker images

We need libressl and openssl images across projects.
ponylang · Jul 3, 2020 · 1e00332 · 1e00332
1 parent 276ae8e
commit 1e00332
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 71 deletions.
diff --git a/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/Dockerfile b/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/Dockerfile
diff --git a/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/README.md b/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/README.md
diff --git a/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/build-and-push.bash b/.ci-dockerfiles/x86-64-unknown-linux-builder-with-openssl/build-and-push.bash
diff --git a/.github/workflows/breakage-against-ponyc-latest.yml b/.github/workflows/breakage-against-ponyc-latest.yml
@@ -5,23 +5,22 @@ on:
     - cron: "0 3 * * *"
 
 jobs:
-  test-1_1_x-vs-ponyc-latest:
-    name: 1.1.x with ponyc master
+  test-libressl-vs-ponyc-latest:
+    name: 0.9.0 with ponyc master
     runs-on: ubuntu-latest
     container:
-      image: ponylang/net-ssl-ci-x86-64-unknown-linux-builder-with-openssl:latest
+      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-libressl:latest
     steps:
       - uses: actions/checkout@v1
       - name: Test
-        run: make test config=debug ssl=1.1.x
+        run: make test config=debug ssl=0.9.0
 
-  test-0_9_0-vs-ponyc-latest:
-    name: 0.9.0 with ponyc master
+  test-openssl-1_1_x-vs-ponyc-latest:
+    name: 1.1.x with ponyc master
     runs-on: ubuntu-latest
     container:
-      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-ssl:latest
+      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.x:latest
     steps:
       - uses: actions/checkout@v1
       - name: Test
-        run: make test config=debug ssl=0.9.0
-
+        run: make test config=debug ssl=1.1.x
diff --git a/.github/workflows/ci-image-updates.yml b/.github/workflows/ci-image-updates.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,22 +13,22 @@ jobs:
       - name: Verify CHANGELOG
         run: changelog-tool verify
 
-  test-1_1_x-vs-ponyc-release:
-    name: 1.1.x with most recent ponyc release
+  test-libressl-vs-ponyc-release:
+    name: 0.9.0 with most recent ponyc release
     runs-on: ubuntu-latest
     container:
-      image: ponylang/net-ssl-ci-x86-64-unknown-linux-builder-with-openssl:release
+      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-libressl:release
     steps:
       - uses: actions/checkout@v1
       - name: Test
-        run: make test config=debug ssl=1.1.x
+        run: make test config=debug ssl=0.9.0
 
-  test-0_9_0-vs-ponyc-release:
-    name: 0.9.0 with most recent ponyc release
+  test-openssl-1_1_x-vs-ponyc-release:
+    name: 1.1.x with most recent ponyc release
     runs-on: ubuntu-latest
     container:
-      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-ssl:release
+      image: ponylang/shared-docker-ci-x86-64-unknown-linux-builder-with-openssl_1.1.x:release
     steps:
       - uses: actions/checkout@v1
       - name: Test
-        run: make test config=debug ssl=0.9.0
+        run: make test config=debug ssl=1.1.x