Correct testing against different Docker versions

dvm only changes the client, not the engine, and the client is irrelevant.
gocd-contrib · Jan 20, 2024 · 93ab05d · 93ab05d
1 parent a3ca96a
commit 93ab05d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/pr_workflow.yml b/.github/workflows/pr_workflow.yml
@@ -11,20 +11,20 @@ jobs:
     strategy:
       matrix:
         docker-version: # See https://endoflife.date/docker-engine
-          - 20.10.24 # EOL ?
-          - 23.0.6   # EOL ?
-          - 24.0.2   # EOL ?
+          - "20.10" # 2020-12 --> EOL 2023-12-10
+          - "23.0"  # 2023-02 --> EOL ?
+          - "24.0"  # 2023-05 --> EOL ?
+      fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-      - name: Set up docker ${{ matrix.docker-version }}
-        run: |
-          curl -sL https://howtowhale.github.io/dvm/downloads/latest/install.sh | sh
-          source ~/.dvm/dvm.sh; dvm install ${{ matrix.docker-version }}
-          source ~/.dvm/dvm.sh; dvm use ${{ matrix.docker-version }} && docker swarm init && docker version
+      - name: Set up Docker
+        uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: ${{ matrix.docker-version }}
       - name: Build with Gradle
         run: ./gradlew assemble check
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -13,21 +13,21 @@ jobs:
     strategy:
       matrix:
         docker-version: # See https://endoflife.date/docker-engine
-          - 20.10.24 # EOL ?
-          - 23.0.6   # EOL ?
-          - 24.0.2   # EOL ?
+          - "20.10" # 2020-12 --> EOL 2023-12-10
+          - "23.0"  # 2023-02 --> EOL ?
+          - "24.0"  # 2023-05 --> EOL ?
+      fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-      - name: Set up docker ${{ matrix.docker-version }}
-        run: |
-          curl -sL https://howtowhale.github.io/dvm/downloads/latest/install.sh | sh
-          source ~/.dvm/dvm.sh; dvm install ${{ matrix.docker-version }}
-          source ~/.dvm/dvm.sh; dvm use ${{ matrix.docker-version }} && docker swarm init && docker version
+      - name: Set up Docker
+        uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: ${{ matrix.docker-version }}
       - name: Build with Gradle
         run: ./gradlew assemble check
   previewGithubRelease: