From d2edb4373e12822ef114563007671dc76a11f22e Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Tue, 20 Feb 2024 20:48:35 +0100 Subject: [PATCH 1/4] Update to Node20 --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 607342c..1202688 100644 --- a/action.yml +++ b/action.yml @@ -11,6 +11,6 @@ inputs: description: The path to a script to execute in SQL Plus when the database is available. The script is executed by system user and may be used to initialize the database with additional users, permissions and more. required: false runs: - using: node16 + using: node20 main: dist/index.js post: dist/index.js From fa7a1df3330bf439b5b310ceb76629b5553a48d2 Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Tue, 20 Feb 2024 19:50:48 +0000 Subject: [PATCH 2/4] Update devcontainer --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index edb3574..d9c0e82 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT=16-bullseye +ARG VARIANT=20 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} RUN npm i -g @vercel/ncc diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5115abf..2be60fe 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Dev", "build": { "dockerfile": "Dockerfile", - "args": { "VARIANT": "18" } + "args": { "VARIANT": "20" } }, "customizations": { From b115f7c2104e82413ba1269c6161b89618768b3d Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Tue, 20 Feb 2024 19:51:01 +0000 Subject: [PATCH 3/4] Update CI --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b90d63b..800d501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,17 +15,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-2019, ubuntu-20.04] + os: [windows-2022, ubuntu-22.04] init-script: - label: 'init-script' path: './.github/workflows/scripts/init.sql' - label: 'no-init-script' path: '' include: - # Add os-name alias for job name - - os: windows-2019 + - os: windows-2022 os-name: Windows - - os: ubuntu-20.04 + - os: ubuntu-22.04 os-name: Linux steps: - name: Checkout From ed3d32dc3614aa2e3ed5b5ecc6268399a265885f Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Tue, 20 Feb 2024 17:11:04 -0500 Subject: [PATCH 4/4] Tweaks for consistency --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 800d501..09e442e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: workflow_dispatch: jobs: ci: - name: ${{ matrix.os-name }}-${{ matrix.init-script.label }} + name: ${{ matrix.name }}-${{ matrix.init-script.label }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -23,14 +23,15 @@ jobs: path: '' include: - os: windows-2022 - os-name: Windows + name: Windows - os: ubuntu-22.04 - os-name: Linux + name: Linux + fail-fast: false steps: - name: Checkout uses: actions/checkout@v4.1.1 - name: Azure login - if: matrix.os-name == 'Windows' + if: matrix.name == 'Windows' uses: azure/login@v1.6.1 with: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}