Merge pull request #120 from aminya/ci [skip ci]

This commit is contained in:
Amin Yahyaabadi 2022-08-26 00:43:34 -07:00 committed by GitHub
commit 37a476edd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions

View File

@ -29,12 +29,12 @@ jobs:
cache_reset_counter: cache_reset_counter:
- 0 - 0
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
- name: Cache - name: Cache
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.pnpm-store ~/.pnpm-store
@ -44,7 +44,7 @@ jobs:
"setupcpp-cache-OS:${{ matrix.os }}-" "setupcpp-cache-OS:${{ matrix.os }}-"
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v2 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
@ -65,7 +65,7 @@ jobs:
- name: Upload Executable - name: Upload Executable
if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-20.04') || contains(matrix.os, 'macos-11')" if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-20.04') || contains(matrix.os, 'macos-11')"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
path: | path: |
./exe ./exe
@ -101,12 +101,12 @@ jobs:
cache_reset_counter: cache_reset_counter:
- 0 - 0
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
- name: Cache - name: Cache
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/.pnpm-store ~/.pnpm-store
@ -115,7 +115,7 @@ jobs:
restore-keys: | restore-keys: |
"setupcpp-docker-cache-OS:${{ matrix.os }}" "setupcpp-docker-cache-OS:${{ matrix.os }}"
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v2 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
@ -132,5 +132,3 @@ jobs:
id: docker_build id: docker_build
run: | run: |
docker build -f ./dev/docker/${{ matrix.container }} -t setup_cpp . docker build -f ./dev/docker/${{ matrix.container }} -t setup_cpp .
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

View File

@ -120,8 +120,8 @@ jobs:
matrix: matrix:
os: os:
- windows-2022 - windows-2022
- ubuntu-20.04 - ubuntu-22.04
- macos-11 - macos-12
compiler: compiler:
- llvm - llvm
- gcc - gcc
@ -130,9 +130,9 @@ jobs:
- os: "windows-2022" - os: "windows-2022"
compiler: "msvc" compiler: "msvc"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Cache - name: Cache
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: | path: |
~/vcpkg ~/vcpkg
@ -224,15 +224,13 @@ jobs:
strategy: strategy:
matrix: matrix:
os: os:
- ubuntu-20.04 - ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Build - name: Build
id: docker_build id: docker_build
run: | run: |
docker build -f ./dev/docker/debian.dockerfile -t setup_cpp . docker build -f ./dev/docker/debian.dockerfile -t setup_cpp .
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
``` ```
### Inside GitLab pipelines ### Inside GitLab pipelines