diff --git a/.github/workflows/.test-unit.yml b/.github/workflows/.test-unit.yml index 4fe63d0d9f..eab3c41171 100644 --- a/.github/workflows/.test-unit.yml +++ b/.github/workflows/.test-unit.yml @@ -106,7 +106,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 35648e7956..051269f882 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -270,7 +270,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 @@ -302,7 +302,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Install gotestlist run: @@ -486,7 +486,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 diff --git a/.github/workflows/.vm.yml b/.github/workflows/.vm.yml index 97f5ef7b9e..8e1915e938 100644 --- a/.github/workflows/.vm.yml +++ b/.github/workflows/.vm.yml @@ -184,7 +184,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Prepare reports run: echo "TESTREPORTS_NAME=$(basename ${{ inputs.template }})*" >> $GITHUB_ENV diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index 449314852d..cfc16a1b6f 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -70,18 +70,6 @@ jobs: } ElseIf ("${{ inputs.os }}" -eq "windows-2022") { echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } - - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~\AppData\Local\go-build - ~\go\pkg\mod - ${{ github.workspace }}\go-build - ${{ env.GOPATH }}\pkg\mod - key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }} - restore-keys: | - ${{ inputs.os }}-${{ github.job }}- - name: Docker info run: | @@ -98,8 +86,6 @@ jobs: name: Build binaries run: | & docker run --name ${{ env.TEST_CTN_NAME }} -e "DOCKER_GITCOMMIT=${{ github.sha }}" ` - -v "${{ github.workspace }}\go-build:C:\Users\ContainerAdministrator\AppData\Local\go-build" ` - -v "${{ github.workspace }}\go\pkg\mod:C:\gopath\pkg\mod" ` ${{ env.TEST_IMAGE_NAME }} hack\make.ps1 -Daemon -Client - name: Copy artifacts @@ -149,18 +135,6 @@ jobs: } ElseIf ("${{ inputs.os }}" -eq "windows-2022") { echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append } - - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~\AppData\Local\go-build - ~\go\pkg\mod - ${{ github.workspace }}\go-build - ${{ env.GOPATH }}\pkg\mod - key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }} - restore-keys: | - ${{ inputs.os }}-${{ github.job }}- - name: Docker info run: | @@ -177,8 +151,6 @@ jobs: name: Test run: | & docker run --name ${{ env.TEST_CTN_NAME }} -e "DOCKER_GITCOMMIT=${{ github.sha }}" ` - -v "${{ github.workspace }}\go-build:C:\Users\ContainerAdministrator\AppData\Local\go-build" ` - -v "${{ github.workspace }}\go\pkg\mod:C:\gopath\pkg\mod" ` -v "${{ env.GOPATH }}\src\github.com\docker\docker\bundles:C:\gopath\src\github.com\docker\docker\bundles" ` ${{ env.TEST_IMAGE_NAME }} hack\make.ps1 -TestUnit - @@ -212,7 +184,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download artifacts uses: actions/download-artifact@v4 @@ -242,7 +214,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Install gotestlist run: @@ -295,6 +267,12 @@ jobs: uses: actions/checkout@v4 with: path: ${{ env.GOPATH }}/src/github.com/docker/docker + - + name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: ${{ env.GO_VERSION }} + cache: false - name: Set up Jaeger run: | @@ -426,12 +404,6 @@ jobs: & "${{ env.BIN_OUT }}\docker" images env: DOCKER_HOST: npipe:////./pipe/docker_engine - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum - name: Test integration if: matrix.test == './...' @@ -523,7 +495,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml index e4b76341bf..5ae597cf46 100644 --- a/.github/workflows/arm64.yml +++ b/.github/workflows/arm64.yml @@ -165,7 +165,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 @@ -268,7 +268,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: Download reports uses: actions/download-artifact@v4 diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 31e48cb3f9..b5644a9e7d 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -108,7 +108,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false - name: BuildKit ref run: | @@ -191,6 +191,7 @@ jobs: - name: Env run: | Get-ChildItem Env: | Out-String + - name: Moby - Init run: | New-Item -ItemType "directory" -Path "${{ github.workspace }}\go-build" @@ -201,18 +202,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~\AppData\Local\go-build - ~\go\pkg\mod - ${{ github.workspace }}\go-build - ${{ env.GOPATH }}\pkg\mod - key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }} - restore-keys: | - ${{ inputs.os }}-${{ github.job }}- + cache: false - name: Docker info run: | @@ -312,22 +302,27 @@ jobs: disabledFeatures="${disabledFeatures},merge_diff" fi echo "BUILDKIT_TEST_DISABLE_FEATURES=${disabledFeatures}" >> $GITHUB_ENV + - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v3 + - name: Checkout uses: actions/checkout@v4 with: path: moby + - name: Set up Go uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - cache-dependency-path: vendor.sum + cache: false + - name: BuildKit ref shell: bash run: | echo "$(./hack/buildkit-ref)" >> $GITHUB_ENV working-directory: moby + - name: Checkout BuildKit ${{ env.BUILDKIT_REF }} uses: actions/checkout@v4 with: @@ -362,6 +357,7 @@ jobs: testFlags="${testFlags} --run=TestIntegration/$testSliceOffset.*/worker=${{ matrix.worker }}" fi echo "TESTFLAGS=${testFlags}" >> $GITHUB_ENV + - name: Test shell: bash run: | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ac92f87c9d..a4ce42e528 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -32,6 +32,9 @@ on: # * * * * * - cron: '0 9 * * 4' +env: + GO_VERSION: "1.24.7" + jobs: codeql: runs-on: ubuntu-24.04 @@ -46,10 +49,11 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 2 - - name: Update Go + - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.24.7" + go-version: ${{ env.GO_VERSION }} + cache: false - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: