Fix CI

devcontainers · Feb 6, 2025 · 1a7047a · 1a7047a
1 parent 3998f9e
commit 1a7047a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 56 deletions.
diff --git a/.azure-devops/azure-pipelines.yml b/.azure-devops/azure-pipelines.yml
@@ -203,17 +203,8 @@ jobs:
       env:
         IMAGE_TAG: $(IMAGE_TAG)
 
-    - script: |
-        sudo apt purge buildah golang-github-containers-common podman skopeo
-        sudo apt autoremove --purge
-        REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
-        source /etc/os-release
-        sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
-        sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
-        sudo apt-key add Release.key
-        sudo apt-get update
-        sudo apt-get install skopeo
-      displayName: Update skopeo
+    - script: skopeo --version
+      displayName: Skopeo version
 
 
     - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

diff --git a/.github/workflows/ci_common.yml b/.github/workflows/ci_common.yml
@@ -76,7 +76,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - id: set_image_push_option
         name: Set image push option
@@ -178,14 +178,14 @@ jobs:
           echo "VERSION_SHORT=${VERSION_SHORT}"
           echo "VERSION_MAJOR=${VERSION_MAJOR}"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Create dev AzDO VSIX artifact
         with:
           name: azdo-task-dev
           path: ./output/devcontainers-dev.ci-${{ steps.build.outputs.version }}.vsix
           if-no-files-found: error
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Create release AzDO VSIX artifact
         with:
           name: azdo-task
@@ -266,7 +266,7 @@ jobs:
           echo "VERSION_MAJOR=${VERSION_MAJOR}"
 
       - name: Download release VSIX
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: azdo-task
           path: output
@@ -364,12 +364,12 @@ jobs:
           echo "VERSION_SHORT: $VERSION_SHORT"
 
       - name: Download workflow artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: output
 
       - name: Download release VSIX
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: azdo-task-dev
           path: output
@@ -512,7 +512,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: ${{ needs.build.outputs.image_push_option == 'filter' }}
@@ -557,7 +557,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: ${{ needs.build.outputs.image_push_option == 'filter' }}
@@ -610,7 +610,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -655,7 +655,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -700,7 +700,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -745,7 +745,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -790,7 +790,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -835,7 +835,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -887,7 +887,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -964,19 +964,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # This can be omitted once runner images have a version of Skopeo > 1.4.1
-      # See https://github.com/containers/skopeo/issues/1874 (and https://github.com/devcontainers/ci/issues/191#issuecomment-1416384710)
-      - name: Update skopeo
-        run: |
-          sudo apt purge buildah golang-github-containers-common podman skopeo
-          sudo apt autoremove --purge
-          REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
-          source /etc/os-release
-          sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
-          sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
-          sudo apt-key add Release.key
-          sudo apt-get update
-          sudo apt-get install skopeo
+      - name: Skopeo version
+        run: skopeo --version
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -1064,19 +1053,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Install updated Skopeo
-        # This can be omitted once runner images have a version of Skopeo > 1.4.1
-        # See https://github.com/containers/skopeo/issues/1874
-        run: |
-          sudo apt purge buildah golang-github-containers-common podman skopeo
-          sudo apt autoremove --purge
-          REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
-          source /etc/os-release
-          sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
-          sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
-          sudo apt-key add Release.key
-          sudo apt-get update
-          sudo apt-get install skopeo
+      - name: Skopeo version
+        run: skopeo --version
 
       # Published action contains compiled JS, but we need to compile it here
       - uses: actions/setup-node@v3
@@ -1138,7 +1116,7 @@ jobs:
           ref: ${{ inputs.prRef }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,6 +30,8 @@ Additionally, it is desirable to add new tests to cover any new functionality.
 
 When a PR is created, some tests will be automatically triggered against the PR. The full suite of tests requires secrets and needs to be triggered by a maintainer.
 
+Testing and publishing the AzDO task requires the `AZDO_TOKEN` GitHub secret to be an AzDO PAT for monacotools with Build Read & Execute, Marketplace Publish and Packing Read & Write permissions.
+
 ## Miscellaneous
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).