Skip to content

Commit 44b448f

Browse files
chrmartichrmarti
committed
Fix CI
1 parent 3998f9e commit 44b448f

File tree

5 files changed

+55
-62
lines changed

5 files changed

+55
-62
lines changed

‎.azure-devops/azure-pipelines.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,8 @@ jobs:
203203
env:
204204
IMAGE_TAG: $(IMAGE_TAG)
205205
206-
- script: |
207-
sudo apt purge buildah golang-github-containers-common podman skopeo
208-
sudo apt autoremove --purge
209-
REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
210-
source /etc/os-release
211-
sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
212-
sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
213-
sudo apt-key add Release.key
214-
sudo apt-get update
215-
sudo apt-get install skopeo
216-
displayName: Update skopeo
206+
- script: skopeo --version
207+
displayName: Skopeo version
217208

218209

219210
- script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

‎.github/dependabot.yml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
version: 2
22
updates:
3-
# Enable version updates for npm
4-
- package-ecosystem: 'npm'
5-
# Look for `package.json` and `lock` files in the `root` directory
6-
directory: '/'
7-
# Check the npm registry for updates every day (weekdays)
3+
- package-ecosystem: "devcontainers"
4+
directory: "/"
85
schedule:
9-
interval: 'daily'
6+
interval: "weekly"
7+
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
13+
- package-ecosystem: "npm"
14+
directory: "azdo-task/DevcontainersCi"
15+
schedule:
16+
interval: "weekly"
17+
18+
- package-ecosystem: "npm"
19+
directory: "/common"
20+
schedule:
21+
interval: "weekly"
22+
23+
- package-ecosystem: "npm"
24+
directory: "/github-action"
25+
schedule:
26+
interval: "weekly"
27+
28+
- package-ecosystem: "npm"
29+
directory: "/.github/scripts"
30+
schedule:
31+
interval: "weekly"

‎.github/workflows/ci_common.yml‎

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
ref: ${{ inputs.prRef }}
7777

7878
- name: Set up Docker Buildx
79-
uses: docker/setup-buildx-action@v2
79+
uses: docker/setup-buildx-action@v3
8080

8181
- id: set_image_push_option
8282
name: Set image push option
@@ -178,14 +178,14 @@ jobs:
178178
echo "VERSION_SHORT=${VERSION_SHORT}"
179179
echo "VERSION_MAJOR=${VERSION_MAJOR}"
180180
181-
- uses: actions/upload-artifact@v3
181+
- uses: actions/upload-artifact@v4
182182
name: Create dev AzDO VSIX artifact
183183
with:
184184
name: azdo-task-dev
185185
path: ./output/devcontainers-dev.ci-${{ steps.build.outputs.version }}.vsix
186186
if-no-files-found: error
187187

188-
- uses: actions/upload-artifact@v3
188+
- uses: actions/upload-artifact@v4
189189
name: Create release AzDO VSIX artifact
190190
with:
191191
name: azdo-task
@@ -266,7 +266,7 @@ jobs:
266266
echo "VERSION_MAJOR=${VERSION_MAJOR}"
267267
268268
- name: Download release VSIX
269-
uses: actions/download-artifact@v3
269+
uses: actions/download-artifact@v4
270270
with:
271271
name: azdo-task
272272
path: output
@@ -364,12 +364,12 @@ jobs:
364364
echo "VERSION_SHORT: $VERSION_SHORT"
365365
366366
- name: Download workflow artifacts
367-
uses: actions/download-artifact@v3
367+
uses: actions/download-artifact@v4
368368
with:
369369
path: output
370370

371371
- name: Download release VSIX
372-
uses: actions/download-artifact@v3
372+
uses: actions/download-artifact@v4
373373
with:
374374
name: azdo-task-dev
375375
path: output
@@ -512,7 +512,7 @@ jobs:
512512
ref: ${{ inputs.prRef }}
513513

514514
- name: Set up Docker Buildx
515-
uses: docker/setup-buildx-action@v2
515+
uses: docker/setup-buildx-action@v3
516516

517517
- name: Login to GitHub Container Registry
518518
if: ${{ needs.build.outputs.image_push_option == 'filter' }}
@@ -557,7 +557,7 @@ jobs:
557557
ref: ${{ inputs.prRef }}
558558

559559
- name: Set up Docker Buildx
560-
uses: docker/setup-buildx-action@v2
560+
uses: docker/setup-buildx-action@v3
561561

562562
- name: Login to GitHub Container Registry
563563
if: ${{ needs.build.outputs.image_push_option == 'filter' }}
@@ -610,7 +610,7 @@ jobs:
610610
ref: ${{ inputs.prRef }}
611611

612612
- name: Set up Docker Buildx
613-
uses: docker/setup-buildx-action@v2
613+
uses: docker/setup-buildx-action@v3
614614

615615
- name: Login to GitHub Container Registry
616616
uses: docker/login-action@v2
@@ -655,7 +655,7 @@ jobs:
655655
ref: ${{ inputs.prRef }}
656656

657657
- name: Set up Docker Buildx
658-
uses: docker/setup-buildx-action@v2
658+
uses: docker/setup-buildx-action@v3
659659

660660
- name: Login to GitHub Container Registry
661661
uses: docker/login-action@v2
@@ -700,7 +700,7 @@ jobs:
700700
ref: ${{ inputs.prRef }}
701701

702702
- name: Set up Docker Buildx
703-
uses: docker/setup-buildx-action@v2
703+
uses: docker/setup-buildx-action@v3
704704

705705
- name: Login to GitHub Container Registry
706706
uses: docker/login-action@v2
@@ -745,7 +745,7 @@ jobs:
745745
ref: ${{ inputs.prRef }}
746746

747747
- name: Set up Docker Buildx
748-
uses: docker/setup-buildx-action@v2
748+
uses: docker/setup-buildx-action@v3
749749

750750
- name: Login to GitHub Container Registry
751751
uses: docker/login-action@v2
@@ -790,7 +790,7 @@ jobs:
790790
ref: ${{ inputs.prRef }}
791791

792792
- name: Set up Docker Buildx
793-
uses: docker/setup-buildx-action@v2
793+
uses: docker/setup-buildx-action@v3
794794

795795
- name: Login to GitHub Container Registry
796796
uses: docker/login-action@v2
@@ -835,7 +835,7 @@ jobs:
835835
ref: ${{ inputs.prRef }}
836836

837837
- name: Set up Docker Buildx
838-
uses: docker/setup-buildx-action@v2
838+
uses: docker/setup-buildx-action@v3
839839

840840
- name: Login to GitHub Container Registry
841841
uses: docker/login-action@v2
@@ -887,7 +887,7 @@ jobs:
887887
ref: ${{ inputs.prRef }}
888888

889889
- name: Set up Docker Buildx
890-
uses: docker/setup-buildx-action@v2
890+
uses: docker/setup-buildx-action@v3
891891

892892
- name: Login to GitHub Container Registry
893893
uses: docker/login-action@v2
@@ -964,19 +964,8 @@ jobs:
964964
- name: Set up Docker Buildx
965965
uses: docker/setup-buildx-action@v3
966966

967-
# This can be omitted once runner images have a version of Skopeo > 1.4.1
968-
# See https://github.com/containers/skopeo/issues/1874 (and https://github.com/devcontainers/ci/issues/191#issuecomment-1416384710)
969-
- name: Update skopeo
970-
run: |
971-
sudo apt purge buildah golang-github-containers-common podman skopeo
972-
sudo apt autoremove --purge
973-
REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
974-
source /etc/os-release
975-
sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
976-
sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
977-
sudo apt-key add Release.key
978-
sudo apt-get update
979-
sudo apt-get install skopeo
967+
- name: Skopeo version
968+
run: skopeo --version
980969

981970
- name: Login to GitHub Container Registry
982971
uses: docker/login-action@v2
@@ -1064,19 +1053,8 @@ jobs:
10641053
- name: Set up Docker Buildx
10651054
uses: docker/setup-buildx-action@v3
10661055

1067-
- name: Install updated Skopeo
1068-
# This can be omitted once runner images have a version of Skopeo > 1.4.1
1069-
# See https://github.com/containers/skopeo/issues/1874
1070-
run: |
1071-
sudo apt purge buildah golang-github-containers-common podman skopeo
1072-
sudo apt autoremove --purge
1073-
REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
1074-
source /etc/os-release
1075-
sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
1076-
sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
1077-
sudo apt-key add Release.key
1078-
sudo apt-get update
1079-
sudo apt-get install skopeo
1056+
- name: Skopeo version
1057+
run: skopeo --version
10801058

10811059
# Published action contains compiled JS, but we need to compile it here
10821060
- uses: actions/setup-node@v3
@@ -1138,7 +1116,7 @@ jobs:
11381116
ref: ${{ inputs.prRef }}
11391117

11401118
- name: Set up Docker Buildx
1141-
uses: docker/setup-buildx-action@v2
1119+
uses: docker/setup-buildx-action@v3
11421120

11431121
- name: Login to GitHub Container Registry
11441122
uses: docker/login-action@v2

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
46+
uses: github/codeql-action/init@v2
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
57+
uses: github/codeql-action/autobuild@v2
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
71+
uses: github/codeql-action/analyze@v2

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Additionally, it is desirable to add new tests to cover any new functionality.
3030

3131
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.
3232

33+
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.
34+
3335
## Miscellaneous
3436

3537
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).

0 commit comments

Comments
 (0)