diff --git a/.github/workflows/xbox_one.yml b/.github/workflows/xbox_one.yml index 7f844d665..08165fa5b 100644 --- a/.github/workflows/xbox_one.yml +++ b/.github/workflows/xbox_one.yml @@ -1,15 +1,13 @@ name: Xbox One / Series -# Temporarily disabled due to https://github.com/diasurgical/devilutionX/issues/5661 on: - workflow_dispatch: -# push: -# branches: -# - master -# pull_request: -# types: [opened, synchronize] -# release: -# types: [published] + push: + branches: + - master + pull_request: + types: [opened, synchronize] + release: + types: [published] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat index 5404dc563..be9a28950 100644 --- a/Packaging/xbox-one/build.bat +++ b/Packaging/xbox-one/build.bat @@ -1,13 +1,7 @@ call VsDevCmd.bat -cd ..\..\uwp-project - -makecert /n CN=devilutionX /r /h 0 /eku "1.3.6.1.5.5.7.3.3,1.3.6.1.4.1.311.10.3.13" /sv devilutionX_Certificate.pvk devilutionX_Certificate.cert - -pvk2pfx /pvk devilutionX_Certificate.pvk /spc devilutionX_Certificate.cert /pfx devilutionX_TemporaryKey.pfx - -mkdir ..\build -cd ..\build +mkdir ..\..\build +cd ..\..\build git clone https://github.com/libsdl-org/SDL.git git -C SDL checkout c7097418711b57e786eeb464bbe366c056b19801 diff --git a/uwp-project/devilutionX_Certificate.pvk b/uwp-project/devilutionX_Certificate.pvk deleted file mode 100644 index e06fd6fd9..000000000 Binary files a/uwp-project/devilutionX_Certificate.pvk and /dev/null differ diff --git a/uwp-project/devilutionX_TemporaryKey.pfx b/uwp-project/devilutionX_TemporaryKey.pfx new file mode 100644 index 000000000..2b5638e97 Binary files /dev/null and b/uwp-project/devilutionX_TemporaryKey.pfx differ diff --git a/uwp-project/devilutionx.vcxproj b/uwp-project/devilutionx.vcxproj index f141b6acd..3f622eab6 100644 --- a/uwp-project/devilutionx.vcxproj +++ b/uwp-project/devilutionx.vcxproj @@ -51,7 +51,6 @@ - devilutionX_TemporaryKey.pfx True False SHA256 @@ -61,6 +60,8 @@ x64 0 ..\build\uwp-project\AppxPackages + 0D43FF406F8BFD3F3325F61908D76FBDAB01425C + devilutionX_TemporaryKey.pfx ..\build\uwp-project\$(Configuration)\ @@ -141,4 +142,4 @@ - + \ No newline at end of file