Skip to content

Commit

Permalink
temp changes for steam:
Browse files Browse the repository at this point in the history
disable update / install check
force mod id to 15 without any of the other side effects like 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
  • Loading branch information
jacob1 committed May 30, 2024
1 parent e371d63 commit cf0f049
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,9 @@ meson_configure+=$'\t'-Dapp_data=$APP_DATA
meson_configure+=$'\t'-Dapp_vendor=$APP_VENDOR
meson_configure+=$'\t'-Dstrip=false
meson_configure+=$'\t'-Db_staticpic=false
meson_configure+=$'\t'-Dmod_id=$MOD_ID
meson_configure+=$'\t'-Dmod_id=15
meson_configure+=$'\t'-Dignore_updates=true
meson_configure+=$'\t'-Dcan_install=yes
case $BSH_HOST_ARCH-$BSH_HOST_PLATFORM-$BSH_HOST_LIBC-$BSH_DEBUG_RELEASE in
x86_64-linux-gnu-debug) ;&
x86_64-windows-mingw-debug) ;&
Expand Down
3 changes: 3 additions & 0 deletions .github/prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ def set_output(key, value):
]:
if priority < do_priority:
continue
# Skip unimportant builds for Steam
if not publish:
continue
job_name = f'build'
if starcatcher:
job_name += f'+target=starcatcher-{starcatcher}'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- id: prepare
run: python ./.github/prepare.py
env:
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT_STEAM }}
GITHUB_REF: ${{ github.ref }}
- if: steps.prepare.outputs.do_release == 'yes'
id: create_release
Expand Down Expand Up @@ -155,10 +155,10 @@ jobs:
- run: mv ${{ matrix.asset_path }} ${{ matrix.starcatcher_name }}
- run: sudo apt update && sudo apt install curlftpfs && bash -c './.github/starcatcher-publish.sh'
env:
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT }}
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME }}
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD }}
PUBLISH_DIRECTORY: ${{ secrets.STARCATCHER_PUBLISH_DIRECTORY }}
PUBLISH_HOSTPORT: ${{ secrets.STARCATCHER_PUBLISH_HOSTPORT_STEAM }}
PUBLISH_USERNAME: ${{ secrets.STARCATCHER_PUBLISH_USERNAME_STEAM }}
PUBLISH_PASSWORD: ${{ secrets.STARCATCHER_PUBLISH_PASSWORD_STEAM }}
PUBLISH_DIRECTORY: ${{ secrets.STARCATCHER_PUBLISH_DIRECTORY_STEAM }}
PUBLISH_FILENAME: ${{ matrix.starcatcher_name }}
release:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions src/PowderToy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ int Main(int argc, char *argv[])
else
perror("failed to chdir to requested ddir");
}
else
/*else
{
auto ddir = Platform::DefaultDdir();
if (!Platform::FileExists("powder.pref"))
Expand All @@ -340,7 +340,7 @@ int Main(int argc, char *argv[])
{
Platform::sharedCwd = ddir;
}
}
}*/
// We're now in the correct directory, time to get prefs.
explicitSingletons->globalPrefs = std::make_unique<GlobalPrefs>();

Expand Down

0 comments on commit cf0f049

Please sign in to comment.