diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 2d8f24bd..8135fe06 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -43,5 +43,6 @@ runs: shell: bash run: | sudo apt update - sudo apt -y install libgtk-3-dev libwebkit2gtk-4.0-dev + sudo apt -y install libgtk-3-dev libwebkit2gtk-4.1-dev + sudo apt -y install libwebkit2gtk-4.0-dev # also install 4.0 because it's the default in wails, so any task that runs a go command would require the added tag diff --git a/.goreleaser.yml b/.goreleaser.yml index 8f76fa03..56d07f66 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,7 +9,7 @@ before: - mkdir -p frontend/build - touch frontend/build/.gitkeep - - wails generate module + - wails generate module -tags webkit2_41 # I have no idea why, but if the tag isn't set here, the final artifact will depend on webkit2gtk-4.0 - pnpm -C frontend install - pnpm -C frontend build @@ -35,6 +35,13 @@ builds: - -s - -skipbindings + overrides: + - goos: linux + goarch: amd64 + goamd64: v1 + tags: + - webkit2_41 + - id: appimage binary: SatisfactoryModManager.AppImage # Parallel builds would overwrite each other, so we need to specify the binary name @@ -57,6 +64,9 @@ builds: - -s - -skipbindings + tags: + - webkit2_41 + - id: nsis binary: SatisfactoryModManager-Setup # This name must match the nsis script OutFile, so the installer overwrites the wails built exe @@ -125,7 +135,7 @@ release: | Windows | Linux | MacOS | |:-------:|:-----:|:-----:| - | [Download](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager-Setup.exe) | [Download (AppImage)](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_linux_amd64.AppImage) | [Download](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_darwin_universal.zip) | - | | [Download (standalone)](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_linux_amd64)
*requires libwebkit2gtk-4.0* | | + | [Download](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager-Setup.exe) | [Download (standalone)](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_linux_amd64)
*requires libwebkit2gtk-4.1* | [Download](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_darwin_universal.zip) | + | | [Download (AppImage)](https://github.com/satisfactorymodding/SatisfactoryModManager/releases/download/v{{.Version}}/SatisfactoryModManager_linux_amd64.AppImage) | | If you already have Satisfactory Mod Manager installed, you don't need to download it again, it will auto-update.