Merge branch 'main' into run-lint-first

* main: fix: update GH actions for uploading/downloading artifacts (testcontainers#2888) feat(ci): Enable master moby with rootless (testcontainers#2880)
mdelapenya · Nov 18, 2024 · a63796b · a63796b
2 parents d8d62d7 + 90388ae
commit a63796b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
@@ -131,7 +131,7 @@ jobs:
         if: ${{ github.ref_name == 'main' && github.repository_owner == 'testcontainers' && runner.name == 'ubuntu-latest' && !inputs.rootless-docker }}
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
-          name: sonarcloud
+          name: sonarcloud-${{ inputs.project-directory }}-${{ inputs.go-version }}-${{ inputs.platform }}
           path: |
             ./sonar-project.properties
             ${{ inputs.project-directory }}/TEST-unit.xml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,7 +115,8 @@ jobs:
 
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
-          name: sonarcloud
+          pattern: sonarcloud-*
+          merge-multiple: true
 
       - name: Analyze with SonarCloud
         uses: sonarsource/sonarcloud-github-action@49e6cd3b187936a73b8280d59ffd9da69df63ec9 # v2.1.1

diff --git a/.github/workflows/docker-moby-latest.yml b/.github/workflows/docker-moby-latest.yml
@@ -11,10 +11,6 @@ jobs:
       matrix:
         rootless-docker: [true, false]
         containerd-integration: [true, false]
-        # ghaction-setup-docker doesn't work with rootless yet
-        exclude:
-          - rootless-docker: true
-            containerd-integration: true
 
     name: "Core tests using latest moby/moby"
     runs-on: 'ubuntu-latest'
@@ -25,14 +21,6 @@ jobs:
           echo "docker_install_type=${{ matrix.rootless-docker == true && 'Rootless' || 'Rootful' }}" >> "$GITHUB_ENV"
           echo "containerd_integration=${{ matrix.containerd-integration == true && 'containerd' || '' }}" >> "$GITHUB_ENV"
 
-      - name: Setup rootless Docker
-        if: ${{ matrix.rootless-docker }}
-        uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
-
-      - name: Remove Docker root socket
-        if: ${{ matrix.rootless-docker }}
-        run: sudo rm -rf /var/run/docker.sock
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
@@ -50,22 +38,17 @@ jobs:
         run: go mod tidy
 
       - name: Install Nightly Docker
-        # rootless not supported with ghaction-setup-docker yet
-        if: ${{ matrix.rootless-docker == false }}
         uses: crazy-max/ghaction-setup-docker@master
         with:
+          rootless: ${{ matrix.rootless-docker }}
+          version: type=image,tag=master
           daemon-config: |
             {
               "debug": true,
               "features": {
                 "containerd-snapshotter": ${{ matrix.containerd-integration }}
               }
             }
-          version: type=image,tag=master
-
-      - name: Install test Docker
-        if: ${{ matrix.rootless-docker }}
-        run: curl https://get.docker.com | CHANNEL=test sh
 
       - name: go test
         timeout-minutes: 30