WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit b2b4d03

Browse files
authored
Merge pull request #40 from libtom/update-ci
Update CI
2 parents 6a5d01c + 097d08f commit b2b4d03

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: [ ubuntu-20.04, ubuntu-22.04 ]
18+
os: [ ubuntu-22.04, ubuntu-24.04 ]
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: set Ubuntu codename

.github/workflows/main.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,39 @@ on:
2424
- /^support\/.*$/
2525
- /^ci\/.*$/
2626

27+
concurrency:
28+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
29+
cancel-in-progress: true
30+
2731
jobs:
2832
Testme:
2933
runs-on: ${{ matrix.os }}
3034
strategy:
3135
matrix:
32-
os: [ ubuntu-20.04 ]
36+
os: [ ubuntu-22.04 ]
3337
# The environment given to the programs in the build
3438
# We have only one program and the variable $BUILDOPTIONS
3539
# has only the options to that program: testme.sh
3640

3741
config:
3842
# GCC for the x86-64 architecture (64-bit longs and 64-bit pointers)
3943
- { CC: 'gcc', DEPS: 'gcc' }
44+
- { CC: 'gcc-9', DEPS: 'gcc-9' }
4045
- { CC: 'gcc-10', DEPS: 'gcc-10' }
41-
- { CC: 'gcc-8', DEPS: 'gcc-8' }
42-
- { CC: 'gcc-7', DEPS: 'gcc-7' }
46+
- { CC: 'gcc-11', DEPS: 'gcc-11' }
47+
- { CC: 'gcc-12', DEPS: 'gcc-12' }
4348

4449
# clang for x86-64 architecture (64-bit longs and 64-bit pointers)
4550
- { CC: 'clang', DEPS: 'clang' }
46-
- { CC: 'clang-10', DEPS: 'clang-10 llvm-10' }
51+
- { CC: 'clang-11', DEPS: 'clang-11 llvm-11' }
4752
- { CC: 'clang-12', DEPS: 'clang-12 llvm-12' }
48-
- { CC: 'clang-9', DEPS: 'clang-9 llvm-9' }
49-
- { CC: 'clang-8', DEPS: 'clang-8 llvm-8' }
50-
- { CC: 'clang-7', DEPS: 'clang-7 llvm-7' }
51-
- { CC: 'clang-6.0', DEPS: 'clang-6.0 llvm-6.0' }
53+
- { CC: 'clang-13', DEPS: 'clang-13 llvm-13' }
54+
- { CC: 'clang-14', DEPS: 'clang-14 llvm-14' }
55+
- { CC: 'clang-15', DEPS: 'clang-15 llvm-15' }
5256

5357
makefile: [ makefile, makefile.shared ]
5458
steps:
55-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v4
5660
- name: install dependencies
5761
run: |
5862
sudo apt-get update -qq
@@ -84,9 +88,9 @@ jobs:
8488
cat gcc_errors_*.log || true
8589
8690
amalgam:
87-
runs-on: ubuntu-20.04
91+
runs-on: ubuntu-22.04
8892
steps:
89-
- uses: actions/checkout@v2
93+
- uses: actions/checkout@v4
9094
- name: build stest with amalgamated sources
9195
run: |
9296
make amalgamated_stest
@@ -95,7 +99,7 @@ jobs:
9599
runs-on: ${{ matrix.os }}
96100
strategy:
97101
matrix:
98-
os: [ ubuntu-20.04, ubuntu-22.04 ]
102+
os: [ ubuntu-22.04, ubuntu-24.04 ]
99103
build_type: [ '', -DCMAKE_BUILD_TYPE=Debug, -DCMAKE_BUILD_TYPE=Release, -DCMAKE_BUILD_TYPE=RelWithDebInfo, -DCMAKE_BUILD_TYPE=MinSizeRel ]
100104
cc: [ clang, gcc ]
101105
config:
@@ -104,7 +108,7 @@ jobs:
104108
# Shared library build
105109
- { CMAKEOPTIONS: '-DBUILD_SHARED_LIBS=On' }
106110
steps:
107-
- uses: actions/checkout@v2
111+
- uses: actions/checkout@v4
108112
- name: install dependencies
109113
run: |
110114
sudo apt-get update -qq

0 commit comments

Comments
 (0)