Skip to content

Commit f9d4a62

Browse files
committed
temp changes for steam:
disable update / install check set mod id to 15, but disable the alternate update server disable most builds I don't care about use alternate secrets so that it doesn't conflict with "modtest" disable shared data directory
1 parent e371d63 commit f9d4a62

6 files changed

Lines changed: 20 additions & 16 deletions

File tree

.github/build.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ meson_configure+=$'\t'-Dapp_vendor=$APP_VENDOR
202202
meson_configure+=$'\t'-Dstrip=false
203203
meson_configure+=$'\t'-Db_staticpic=false
204204
meson_configure+=$'\t'-Dmod_id=$MOD_ID
205+
meson_configure+=$'\t'-Dignore_updates=true
205206
case $BSH_HOST_ARCH-$BSH_HOST_PLATFORM-$BSH_HOST_LIBC-$BSH_DEBUG_RELEASE in
206207
x86_64-linux-gnu-debug) ;&
207208
x86_64-windows-mingw-debug) ;&
@@ -288,13 +289,13 @@ if [[ $RELEASE_TYPE == snapshot ]] && [[ $MOD_ID != 0 ]]; then
288289
>&2 echo "mods and snapshots do not mix"
289290
exit 1
290291
fi
291-
if [[ $RELEASE_TYPE == snapshot ]] || [[ $MOD_ID != 0 ]]; then
292-
meson_configure+=$'\t'-Dupdate_server=starcatcher.us/TPT
293-
if [[ $BSH_HOST_PLATFORM == emscripten ]]; then
294-
meson_configure+=$'\t'-Dserver=tptserv.starcatcher.us
295-
meson_configure+=$'\t'-Dstatic_server=tptserv.starcatcher.us/Static
296-
fi
297-
fi
292+
#if [[ $RELEASE_TYPE == snapshot ]] || [[ $MOD_ID != 0 ]]; then
293+
# meson_configure+=$'\t'-Dupdate_server=starcatcher.us/TPT
294+
# if [[ $BSH_HOST_PLATFORM == emscripten ]]; then
295+
# meson_configure+=$'\t'-Dserver=tptserv.starcatcher.us
296+
# meson_configure+=$'\t'-Dstatic_server=tptserv.starcatcher.us/Static
297+
# fi
298+
#fi
298299
if [[ $RELEASE_TYPE != dev ]]; then
299300
meson_configure+=$'\t'-Dignore_updates=false
300301
fi

.github/mod_id.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0
1+
15

.github/prepare.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ def set_output(key, value):
141141
]:
142142
if priority < do_priority:
143143
continue
144+
# Skip unimportant builds for Steam
145+
if not publish:
146+
continue
144147
job_name = f'build'
145148
if starcatcher:
146149
job_name += f'+target=starcatcher-{starcatcher}'

.github/workflows/build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- id: prepare
4040
run: python ./.github/prepare.py
4141
env:
42-
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
42+
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT_STEAM }}
4343
GITHUB_REF: ${{ github.ref }}
4444
- if: steps.prepare.outputs.do_release == 'yes'
4545
id: create_release
@@ -155,10 +155,10 @@ jobs:
155155
- run: mv ${{ matrix.asset_path }} ${{ matrix.starcatcher_name }}
156156
- run: sudo apt update && sudo apt install curlftpfs && bash -c './.github/starcatcher-publish.sh'
157157
env:
158-
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
159-
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME }}
160-
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }}
161-
PUBLISH_DIRECTORY: ${{ secrets.STARCATCHER_PUBLISH_DIRECTORY }}
158+
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT_STEAM }}
159+
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME_STEAM }}
160+
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD_STEAM }}
161+
PUBLISH_DIRECTORY: ${{ secrets.STARCATCHER_PUBLISH_DIRECTORY_STEAM }}
162162
PUBLISH_FILENAME: ${{ matrix.starcatcher_name }}
163163
release:
164164
runs-on: ubuntu-latest

src/PowderToy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ int Main(int argc, char *argv[])
321321
else
322322
perror("failed to chdir to requested ddir");
323323
}
324-
else
324+
/*else
325325
{
326326
auto ddir = Platform::DefaultDdir();
327327
if (!Platform::FileExists("powder.pref"))
@@ -340,7 +340,7 @@ int Main(int argc, char *argv[])
340340
{
341341
Platform::sharedCwd = ddir;
342342
}
343-
}
343+
}*/
344344
// We're now in the correct directory, time to get prefs.
345345
explicitSingletons->globalPrefs = std::make_unique<GlobalPrefs>();
346346

src/common/platform/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ conf_data.set('USE_BLUESCREEN', use_bluescreen.to_string())
9696

9797
can_install = get_option('can_install')
9898
if can_install == 'auto'
99-
can_install = 'yes_check'
99+
can_install = 'yes'
100100
if is_debug
101101
can_install = 'yes'
102102
endif

0 commit comments

Comments
 (0)