Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Choice] Debian / Ubuntu version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04
# See https://github.com/microsoft/vscode-dev-containers/tree/master/containers/debian
ARG VARIANT=debian-10
ARG VARIANT=debian-12
FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}


Expand Down Expand Up @@ -42,7 +42,7 @@ ENV DEVCONTAINER=true

# node
COPY scripts/node.sh /tmp/
RUN /bin/bash /tmp/node.sh 16.x
RUN /bin/bash /tmp/node.sh 20.x

# docker-client
COPY scripts/docker-client.sh /tmp/
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/node.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
VERSION=${1:-"14.x"}
VERSION=${1:-"20.x"}
CMD=node
NAME="Node.js"

Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "build.js",
"license": "MIT",
"devDependencies": {
"jest": "^27.5.1"
"jest": "^29.7.0"
},
"scripts": {
"test": "jest --verbose",
Expand Down
1,763 changes: 821 additions & 942 deletions .github/scripts/yarn.lock

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions .github/workflows/ci_common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
node --version
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -430,7 +430,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -524,7 +524,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -577,7 +577,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -622,7 +622,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -667,7 +667,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -712,7 +712,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -757,7 +757,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -802,7 +802,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -854,7 +854,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -888,7 +888,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -943,7 +943,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -997,7 +997,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -1035,7 +1035,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down Expand Up @@ -1106,7 +1106,7 @@ jobs:
# Published action contains compiled JS, but we need to compile it here
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Compile GH action
run: |
(cd common && npm install && npm run build)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clean_untagged.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ do
echo "Checking for untagged versions for $image_name"
escaped_image_name=$(echo ${image_name} | sed "s/\//%2f/g")
response=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3+json" "https://api.github.com/orgs/devcontainers/packages/container/$escaped_image_name/versions?per_page=100")
message=$(echo $response | jq -r .message)
if [[ $message == "null" ]]; then
message=$(echo $response | jq -r ".message?")
if [[ -z "$message" || "$message" == "null" ]]; then
version_ids=$( | jq -r ".[] | select(.metadata.container.tags | length ==0) | .id")
for version_id in ${version_ids[@]};
do
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ outputs:
runCmdOutput:
description: The output of the command specified in the runCmd input
runs:
using: 'node16'
using: 'node20'
main: 'github-action/run-main.js'
post: 'github-action/run-post.js'
post-if: 'success()'
1 change: 1 addition & 0 deletions azdo-task/DevcontainersCi/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"rules": {
"eslint-comments/no-use": "off",
"import/no-namespace": "off",
"i18n-text/no-en": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
Expand Down
4 changes: 2 additions & 2 deletions azdo-task/DevcontainersCi/__tests__/exec.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ describe('exec', () => {
const result = await exec('bash', ['-c', 'echo hi'], {silent: false});
console.log(result);
expect(result.exitCode).toBe(0);
expect(result.stdout).toStrictEqual('hi\n');
expect(result.stdout).toStrictEqual('hi\n\n');
});
test('silent returns correct output', async () => {
const result = await exec('bash', ['-c', 'echo hi'], {silent: true});
console.log(result);
expect(result.exitCode).toBe(0);
expect(result.stdout).toStrictEqual('hi\n');
expect(result.stdout).toStrictEqual('hi\n\n');
});
});
Loading