[Actions] Update setup-docker [sync git]

Signed-off-by: Kang Huaishuai <[email protected]>
khs1994-docker · Aug 25, 2023 · fe636fc · fe636fc
1 parent 1571e33
commit fe636fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/actions/setup-docker/.github/workflows/ci.yaml b/.github/actions/setup-docker/.github/workflows/ci.yaml
@@ -20,6 +20,8 @@ jobs:
           - 18.09
           - 19.03
           - "20.10"
+          - "23.0"
+          - "24.0"
         docker_channel:
           - stable
           - test
@@ -28,7 +30,7 @@ jobs:
           - ubuntu-20.04
           - ubuntu-22.04
           - ubuntu-latest
-          - macos-12
+          - macos-13
         include:
           # macOS
           - os: macos-latest
@@ -140,7 +142,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-18.04
           - ubuntu-20.04
           - ubuntu-22.04
           - ubuntu-latest

diff --git a/.github/actions/setup-docker/lib/setup-docker.js b/.github/actions/setup-docker/lib/setup-docker.js
@@ -318,7 +318,7 @@ system_profiler SPHardwareDataType || true
       'docker-ce',
       '|',
       'grep',
-      '20.10'
+      '24.0'
     ]);
     core.endGroup()
 
@@ -347,6 +347,7 @@ system_profiler SPHardwareDataType || true
     await exec.exec('sudo', [
       'apt-get',
       '-y',
+      '--allow-downgrades',
       'install',
       DOCKER_VERSION_STRING ? `docker-ce=${DOCKER_VERSION_STRING}` : 'docker-ce',
       DOCKER_VERSION_STRING ? `docker-ce-cli=${DOCKER_VERSION_STRING}` : 'docker-ce-cli'