Skip to content

Commit 4aa33c7

Browse files
asariumasarium
committed
Disable Qt projects since downloads are broken
1 parent 373dbeb commit 4aa33c7

File tree

4 files changed

+113
-113
lines changed

4 files changed

+113
-113
lines changed

‎.github/workflows/build-nightly.yaml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717
runs-on: ubuntu-latest
1818
container: ghcr.io/scp-fs2open/linux_build:sha-a8ca321
1919
steps:
20-
- name: Cache Qt
21-
id: cache-qt-lin
22-
uses: actions/cache@v1
23-
with:
24-
path: ${{ github.workspace }}/../Qt
25-
key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
26-
- name: Install Qt
27-
uses: jurplel/install-qt-action@v2
28-
with:
29-
version: ${{ env.QT_VERSION }}
30-
dir: ${{ github.workspace }}/..
31-
cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
20+
# - name: Cache Qt
21+
# id: cache-qt-lin
22+
# uses: actions/cache@v1
23+
# with:
24+
# path: ${{ github.workspace }}/../Qt
25+
# key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
26+
# - name: Install Qt
27+
# uses: jurplel/install-qt-action@v2
28+
# with:
29+
# version: ${{ env.QT_VERSION }}
30+
# dir: ${{ github.workspace }}/..
31+
# cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
3232

3333
- uses: actions/checkout@v1
3434
name: Checkout
@@ -107,30 +107,30 @@ jobs:
107107
name: Checkout
108108
with:
109109
submodules: true
110-
- name: Cache Qt
111-
id: cache-qt-win
112-
uses: actions/cache@v1
113-
with:
114-
path: ${{ github.workspace }}/../Qt
115-
key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
116-
- name: Install Qt (32 bit)
117-
uses: jurplel/install-qt-action@v2
118-
if: ${{ matrix.arch == 'Win32' }}
119-
with:
120-
version: ${{ env.QT_VERSION }}
121-
dir: ${{ github.workspace }}/..
122-
arch: win32_msvc2017
123-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
124-
aqtversion: ==0.8
125-
- name: Install Qt (64 bit)
126-
uses: jurplel/install-qt-action@v2
127-
if: ${{ matrix.arch == 'x64' }}
128-
with:
129-
version: ${{ env.QT_VERSION }}
130-
dir: ${{ github.workspace }}/..
131-
arch: win64_msvc2017_64
132-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
133-
aqtversion: ==0.8
110+
# - name: Cache Qt
111+
# id: cache-qt-win
112+
# uses: actions/cache@v1
113+
# with:
114+
# path: ${{ github.workspace }}/../Qt
115+
# key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
116+
# - name: Install Qt (32 bit)
117+
# uses: jurplel/install-qt-action@v2
118+
# if: ${{ matrix.arch == 'Win32' }}
119+
# with:
120+
# version: ${{ env.QT_VERSION }}
121+
# dir: ${{ github.workspace }}/..
122+
# arch: win32_msvc2017
123+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
124+
# aqtversion: ==0.8
125+
# - name: Install Qt (64 bit)
126+
# uses: jurplel/install-qt-action@v2
127+
# if: ${{ matrix.arch == 'x64' }}
128+
# with:
129+
# version: ${{ env.QT_VERSION }}
130+
# dir: ${{ github.workspace }}/..
131+
# arch: win64_msvc2017_64
132+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
133+
# aqtversion: ==0.8
134134

135135
- name: Configure CMake
136136
env:
@@ -144,7 +144,7 @@ jobs:
144144
145145
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
146146
-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$SIMD" \
147-
-DFSO_BUILD_QTFRED=ON -DFSO_BUILD_TESTS=ON \
147+
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
148148
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
149149
-G "Visual Studio 16 2019" -T "v142" ..
150150
- name: Compile

‎.github/workflows/build-release.yaml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ jobs:
4141
runs-on: ubuntu-latest
4242
container: ghcr.io/scp-fs2open/linux_build:sha-a8ca321
4343
steps:
44-
- name: Cache Qt
45-
id: cache-qt-lin
46-
uses: actions/cache@v1
47-
with:
48-
path: ${{ github.workspace }}/../Qt
49-
key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
50-
- name: Install Qt
51-
uses: jurplel/install-qt-action@v2
52-
with:
53-
version: ${{ env.QT_VERSION }}
54-
dir: ${{ github.workspace }}/..
55-
cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
44+
# - name: Cache Qt
45+
# id: cache-qt-lin
46+
# uses: actions/cache@v1
47+
# with:
48+
# path: ${{ github.workspace }}/../Qt
49+
# key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
50+
# - name: Install Qt
51+
# uses: jurplel/install-qt-action@v2
52+
# with:
53+
# version: ${{ env.QT_VERSION }}
54+
# dir: ${{ github.workspace }}/..
55+
# cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
5656

5757
- uses: actions/checkout@v1
5858
name: Checkout
@@ -142,30 +142,30 @@ jobs:
142142
name: Checkout
143143
with:
144144
submodules: true
145-
- name: Cache Qt
146-
id: cache-qt-win
147-
uses: actions/cache@v1
148-
with:
149-
path: ${{ github.workspace }}/../Qt
150-
key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
151-
- name: Install Qt (32 bit)
152-
uses: jurplel/install-qt-action@v2
153-
if: ${{ matrix.arch == 'Win32' }}
154-
with:
155-
version: ${{ env.QT_VERSION }}
156-
dir: ${{ github.workspace }}/..
157-
arch: win32_msvc2017
158-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
159-
aqtversion: ==0.8
160-
- name: Install Qt (64 bit)
161-
uses: jurplel/install-qt-action@v2
162-
if: ${{ matrix.arch == 'x64' }}
163-
with:
164-
version: ${{ env.QT_VERSION }}
165-
dir: ${{ github.workspace }}/..
166-
arch: win64_msvc2017_64
167-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
168-
aqtversion: ==0.8
145+
# - name: Cache Qt
146+
# id: cache-qt-win
147+
# uses: actions/cache@v1
148+
# with:
149+
# path: ${{ github.workspace }}/../Qt
150+
# key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
151+
# - name: Install Qt (32 bit)
152+
# uses: jurplel/install-qt-action@v2
153+
# if: ${{ matrix.arch == 'Win32' }}
154+
# with:
155+
# version: ${{ env.QT_VERSION }}
156+
# dir: ${{ github.workspace }}/..
157+
# arch: win32_msvc2017
158+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
159+
# aqtversion: ==0.8
160+
# - name: Install Qt (64 bit)
161+
# uses: jurplel/install-qt-action@v2
162+
# if: ${{ matrix.arch == 'x64' }}
163+
# with:
164+
# version: ${{ env.QT_VERSION }}
165+
# dir: ${{ github.workspace }}/..
166+
# arch: win64_msvc2017_64
167+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
168+
# aqtversion: ==0.8
169169

170170
- name: Configure CMake
171171
env:
@@ -179,7 +179,7 @@ jobs:
179179
180180
cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
181181
-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$SIMD" \
182-
-DFSO_BUILD_QTFRED=ON -DFSO_BUILD_TESTS=ON \
182+
-DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
183183
-DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
184184
-G "Visual Studio 16 2019" -T "v142" ..
185185
- name: Compile

‎.github/workflows/pr-workflow.yaml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424
runs-on: ubuntu-latest
2525
container: ghcr.io/scp-fs2open/linux_build:sha-e977d36
2626
steps:
27-
- name: Cache Qt
28-
id: cache-qt-lin
29-
uses: actions/cache@v1
30-
with:
31-
path: ${{ github.workspace }}/../Qt
32-
key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
33-
- name: Install Qt
34-
uses: jurplel/install-qt-action@v2
35-
with:
36-
version: ${{ env.QT_VERSION }}
37-
dir: ${{ github.workspace }}/..
38-
cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
39-
setup-python: 'false'
27+
# - name: Cache Qt
28+
# id: cache-qt-lin
29+
# uses: actions/cache@v1
30+
# with:
31+
# path: ${{ github.workspace }}/../Qt
32+
# key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
33+
# - name: Install Qt
34+
# uses: jurplel/install-qt-action@v2
35+
# with:
36+
# version: ${{ env.QT_VERSION }}
37+
# dir: ${{ github.workspace }}/..
38+
# cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
39+
# setup-python: 'false'
4040

4141
- uses: actions/checkout@v1
4242
name: Checkout
@@ -83,30 +83,30 @@ jobs:
8383
name: Checkout
8484
with:
8585
submodules: true
86-
- name: Cache Qt
87-
id: cache-qt-win
88-
uses: actions/cache@v1
89-
with:
90-
path: ${{ github.workspace }}/../Qt
91-
key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
92-
- name: Install Qt (32 bit)
93-
uses: jurplel/install-qt-action@v2
94-
if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'Win32' }}
95-
with:
96-
version: ${{ env.QT_VERSION }}
97-
dir: ${{ github.workspace }}/..
98-
arch: win32_msvc2017
99-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
100-
aqtversion: ==0.8
101-
- name: Install Qt (64 bit)
102-
uses: jurplel/install-qt-action@v2
103-
if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'x64' }}
104-
with:
105-
version: ${{ env.QT_VERSION }}
106-
dir: ${{ github.workspace }}/..
107-
arch: win64_msvc2017_64
108-
cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
109-
aqtversion: ==0.8
86+
# - name: Cache Qt
87+
# id: cache-qt-win
88+
# uses: actions/cache@v1
89+
# with:
90+
# path: ${{ github.workspace }}/../Qt
91+
# key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
92+
# - name: Install Qt (32 bit)
93+
# uses: jurplel/install-qt-action@v2
94+
# if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'Win32' }}
95+
# with:
96+
# version: ${{ env.QT_VERSION }}
97+
# dir: ${{ github.workspace }}/..
98+
# arch: win32_msvc2017
99+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
100+
# aqtversion: ==0.8
101+
# - name: Install Qt (64 bit)
102+
# uses: jurplel/install-qt-action@v2
103+
# if: ${{ matrix.compiler == 'MSVC' && matrix.arch == 'x64' }}
104+
# with:
105+
# version: ${{ env.QT_VERSION }}
106+
# dir: ${{ github.workspace }}/..
107+
# arch: win64_msvc2017_64
108+
# cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
109+
# aqtversion: ==0.8
110110

111111
- name: Configure CMake
112112
env:
@@ -124,7 +124,7 @@ jobs:
124124
else
125125
cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
126126
-DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 16 2019" \
127-
-DFSO_BUILD_QTFRED=ON -T "v142" -A "$ARCHITECTURE" ..
127+
-DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
128128
fi
129129
- name: Compile
130130
working-directory: ./build

‎ci/linux/configure_cmake.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ export LD_LIBRARY_PATH
3232

3333
cmake -G Ninja -DFSO_FATAL_WARNINGS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $CMAKE_OPTIONS \
3434
-DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_BUILD_APPIMAGE=ON -DCMAKE_BUILD_TYPE=$CONFIGURATION \
35-
-DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=ON ..
35+
-DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=OFF ..

0 commit comments

Comments
 (0)