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": { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b90d63b..09e442e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,27 +11,27 @@ 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: - 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-name: Windows - - os: ubuntu-20.04 - os-name: Linux + - os: windows-2022 + name: Windows + - os: ubuntu-22.04 + 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 }} 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