Skip to content

Fix CI #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrmarti merged 1 commit into from
Feb 6, 2025
Merged

Fix CI #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .azure-devops/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 28 additions & 6 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
version: 2
updates:
# Enable version updates for npm
- package-ecosystem: 'npm'
# Look for `package.json` and `lock` files in the `root` directory
directory: '/'
# Check the npm registry for updates every day (weekdays)
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: 'daily'
interval: "weekly"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "azdo-task/DevcontainersCi"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/common"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/github-action"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/.github/scripts"
schedule:
interval: "weekly"
62 changes: 20 additions & 42 deletions .github/workflows/ci_common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
Expand Down Expand Up @@ -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' }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
Expand Down
Loading