Skip to content

Commit 7c1f245

Browse files
Merge branch 'main' into EOL_changes_alpine
2 parents 38c5ef3 + 27641b8 commit 7c1f245

File tree

80 files changed

+9442
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+9442
-916
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
55
"ghcr.io/devcontainers/features/azure-cli:1": {}
66
},
7-
"postCreateCommand": "npm install -g @devcontainers/cli",
7+
"postCreateCommand": "sudo corepack enable && corepack prepare yarn@4.9.4 --activate && npm install -g @devcontainers/cli",
88
"customizations": {
99
"vscode": {
1010
"extensions": [

.github/workflows/push-again.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
6161
# Setup build CLI
6262
cd "$GITHUB_WORKSPACE/ref"
63+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
64+
sudo corepack enable
65+
sudo corepack prepare yarn@4.9.4 --activate
6366
yarn install
6467
npm install -g @devcontainers/cli
6568

.github/workflows/push-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ jobs:
4848
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
4949
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
5050
51+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
52+
sudo corepack enable
53+
sudo corepack prepare yarn@4.9.4 --activate
5154
# Build and push dev images
5255
yarn install
5356
npm install -g @devcontainers/cli

.github/workflows/push-manual-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
5757
# Setup build CLI
5858
cd "$GITHUB_WORKSPACE/ref"
59+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
60+
sudo corepack enable
61+
sudo corepack prepare yarn@4.9.4 --activate
5962
yarn install
6063
npm install -g @devcontainers/cli
6164

.github/workflows/push.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
5252
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
5353
54+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
55+
sudo corepack enable
56+
sudo corepack prepare yarn@4.9.4 --activate
5457
# Build and push images
5558
yarn install
5659
npm install -g @devcontainers/cli

.github/workflows/release-pr.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Create release pull request
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
type: string
8+
description: New version, in the form v0.4.x
9+
required: true
10+
11+
permissions:
12+
contents: write
13+
14+
15+
jobs:
16+
update_manifest_files:
17+
runs-on: ubuntu-latest
18+
env:
19+
target_branch: rel/${{github.event.inputs.version}}
20+
version: ${{github.event.inputs.version}}
21+
steps:
22+
- uses: actions/checkout@v5
23+
- name: Set up Node.js
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: 20
27+
- name: Install devcontainers CLI
28+
run: npm i -g @devcontainers/cli
29+
- name: Update manifest files
30+
run: ./build/prepare-release.sh
31+
- name: Push manifest updates
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.PAT }}
34+
run: |
35+
git config --global user.email github-actions@github.com
36+
git config --global user.name github-actions
37+
git checkout -b $target_branch
38+
git add -A
39+
git commit -m "Release manifest update"
40+
git push origin $target_branch
41+
- name: Create pull request
42+
env:
43+
GITHUB_TOKEN: ${{ secrets.PAT }}
44+
run: |
45+
gh api \
46+
--method POST \
47+
-H "Accept: application/vnd.github+json" \
48+
/repos/${GITHUB_REPOSITORY}/pulls \
49+
-f title="[Monthly Release] $version" \
50+
-f body="" \
51+
-f head="$target_branch" \
52+
-f base='main'
53+
54+

.github/workflows/version-history.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
6565
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
6666
67+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
68+
sudo corepack enable
69+
sudo corepack prepare yarn@4.9.4 --activate
6770
yarn install
6871
RELEASE_STRING=$(echo "${{ inputs.release }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
6972
OVERWRITE_STRING=$(if [ "${{ inputs.overwrite }}" = "false" ]; then echo '--no-overwrite'; else echo '--overwrite'; fi)

.yarn/install-state.gz

29.7 KB
Binary file not shown.

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"files": [
3-
"src"
4-
],
5-
"devDependencies": {
6-
"mkdirp": "0.5.5",
7-
"copyfiles": "^2.4.1",
8-
"handlebars": "^4.7.7",
9-
"jsonc": "^2.0.0",
10-
"rimraf": "^3.0.2"
11-
}
12-
}
3+
"src"
4+
],
5+
"devDependencies": {
6+
"copyfiles": "^2.4.1",
7+
"handlebars": "^4.7.7",
8+
"jsonc": "^2.0.0",
9+
"mkdirp": "0.5.5",
10+
"rimraf": "^3.0.2"
11+
},
12+
"packageManager": "yarn@4.9.4"
13+
}

0 commit comments

Comments
 (0)