File tree Expand file tree Collapse file tree 8 files changed +9
-24
lines changed Expand file tree Collapse file tree 8 files changed +9
-24
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ on: [push]
1212jobs :
1313 build :
1414
15- runs-on : ubuntu-20 .04
15+ runs-on : ubuntu-22 .04
1616
1717 steps :
1818 - uses : actions/checkout@v1
Original file line number Diff line number Diff line change 1212 - cookiecutter
1313jobs :
1414 cookiecutter :
15- runs-on : ubuntu-20 .04
15+ runs-on : ubuntu-22 .04
1616 steps :
1717 - uses : actions/checkout@v1
1818 # Remove apt repos that are known to break from time to time
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ on: [push]
1212jobs :
1313 build :
1414
15- runs-on : ubuntu-20 .04
15+ runs-on : ubuntu-22 .04
1616
1717 steps :
1818 - uses : actions/checkout@v1
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ on: [push]
1212jobs :
1313 build :
1414
15- runs-on : ubuntu-20 .04
15+ runs-on : ubuntu-22 .04
1616
1717 steps :
1818 - uses : actions/checkout@v1
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ on: [push]
1111
1212jobs :
1313 build :
14- runs-on : ubuntu-20 .04
14+ runs-on : ubuntu-22 .04
1515
1616 steps :
1717 - uses : actions/checkout@v1
Original file line number Diff line number Diff line change @@ -12,15 +12,9 @@ linux:!android {
1212 QMAKE_LINK = clang ++
1313 QMAKE_CC = clang
1414 } else {
15- greaterThan(QT_MAJOR_VERSION, 5) {
16- QMAKE_CXX = g ++-9
17- QMAKE_LINK = g ++-9
18- QMAKE_CC = gcc-9
19- } else {
20- QMAKE_CXX = g ++-7
21- QMAKE_LINK = g ++-7
22- QMAKE_CC = gcc-7
23- }
15+ QMAKE_CXX = g ++-11
16+ QMAKE_LINK = g ++-11
17+ QMAKE_CC = gcc-11
2418 }
2519}
2620
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ git commit -am "cookiecutterized invocation($INVOCATION_ID)"
2121
2222# Exercise cookiecutter and associated tests
2323cd $HOME
24- pip3 install -U pip setuptools
2524pip3 install cookiecutter
2625pip3 show cookiecutter
2726sudo apt install tree
Original file line number Diff line number Diff line change @@ -25,14 +25,6 @@ if ! [ -x "$(command -v sudo)" ]; then
2525 apt-get --assume-yes install sudo
2626fi
2727
28- if [[ -n ${GITHUB_ACTIONS-} ]];
29- then
30- # A workaround (for github action) from: https://github.com/Microsoft/azure-pipelines-image-generation/issues/672
31- sudo apt-get remove -y clang-6.0 libclang-common-6.0-dev libclang1-6.0 libllvm6.0
32- sudo apt-get autoremove
33- # end workaround
34- fi
35-
3628sudo dpkg --add-architecture i386
3729
3830sudo apt-get update
@@ -51,7 +43,7 @@ sudo apt-get --assume-yes install \
5143 gdb \
5244 git \
5345 gnupg \
54- g++-7 \
46+ g++-11 \
5547 libc-bin \
5648 libdbus-1-3 \
5749 libfontconfig1 \
You can’t perform that action at this time.
0 commit comments