Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for Alpha.6 #2247

Merged
merged 2 commits into from
Mar 31, 2024
Merged

Prepare for Alpha.6 #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0475974
Update vcpkgGitCommitId for Alpha6
jwrober Mar 30, 2024
e9a0928
Remove 32bit windows package
jwrober Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
- uses: lukka/run-vcpkg@v11
name: Install dependencies
with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
vcpkgGitCommitId: a34c873a9717a888f58dc05268dea15592c2f0ff
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
- name: Configure
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
- uses: lukka/run-vcpkg@v11
name: Install dependencies
with:
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
vcpkgGitCommitId: a34c873a9717a888f58dc05268dea15592c2f0ff
- name: Build
uses: lukka/run-cmake@v10
with:
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,55 +72,3 @@ jobs:
build/Freeciv21-${{github.ref_name}}.tar.gz.sha256
build/Freeciv21-${{github.ref_name}}.zip
build/Freeciv21-${{github.ref_name}}.zip.sha256
i686-windows:
name: "Create i686 Windows Package"
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
if: github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: msys2/setup-msys2@v2
with:
msystem: MINGW32
update: true
install: |
git
mingw-w64-i686-cmake
mingw-w64-i686-ninja
mingw-w64-i686-nsis
mingw-w64-i686-gcc
mingw-w64-i686-libunwind
mingw-w64-i686-readline
mingw-w64-i686-lua
mingw-w64-i686-SDL2_mixer
mingw-w64-i686-qt5-base
mingw-w64-i686-qt5-svg
mingw-w64-i686-karchive-qt5
- name: Configure
run: |
export PATH=/mingw32/bin:${PATH}
export MSYSTEM=MINGW32
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig
cmake . -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=$PWD/build/install \
-DCMAKE_BUILD_TYPE=Release
- name: Build
run: |
cmake --build build
- name: Install
run: |
cmake --build build --target install
- name: Package
run: |
cmake --build build --target package
- name: Upload package
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
build/Windows-i686/Freeciv21-*-Windows-i686.exe
build/Windows-i686/Freeciv21-*-Windows-i686.exe.sha256
Loading