ci: clean up docker task

This commit is contained in:
abeimler 2023-04-06 16:07:02 +02:00
parent 4d028e9368
commit db7a01cfd3
1 changed files with 8 additions and 23 deletions

View File

@ -24,13 +24,15 @@ jobs:
- ubuntu-18.04 - ubuntu-18.04
- macos-12 - macos-12
- macos-11 - macos-11
node:
- 16
- 18
pnpm:
- 8
cache_reset_counter: cache_reset_counter:
- 0 - 0
include:
- node: 12
pnpm: 6
- node: 16
pnpm: 7
- node: 18
pnpm: 8
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -67,7 +69,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip test]')" if: "!contains(github.event.head_commit.message, '[skip test]')"
run: | run: |
pnpm run test pnpm run test
continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') }} continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') || contains(matrix.node, '12') }}
# Create self-contained executable that bundles Nodejs # Create self-contained executable that bundles Nodejs
- name: Create Executable - name: Create Executable
@ -130,10 +132,6 @@ jobs:
- "ubuntu_22.04_node.dockerfile" - "ubuntu_22.04_node.dockerfile"
- "arch_node.dockerfile" - "arch_node.dockerfile"
- "fedora_node.dockerfile" - "fedora_node.dockerfile"
node:
- 18
pnpm:
- 8
cache_reset_counter: cache_reset_counter:
- 0 - 0
steps: steps:
@ -150,19 +148,6 @@ jobs:
key: "setupcpp-docker-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}-${{ matrix.cache_reset_counter }}" key: "setupcpp-docker-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}-${{ matrix.cache_reset_counter }}"
restore-keys: | restore-keys: |
"setupcpp-docker-cache-OS:${{ matrix.os }}" "setupcpp-docker-cache-OS:${{ matrix.os }}"
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Setup Pnpm
uses: pnpm/action-setup@v2
with:
version: ${{ matrix.pnpm }}
- name: Install and build
run: |
pnpm install
- name: Build - name: Build
id: docker_build id: docker_build