Skip to content

Commit

Permalink
Troubleshooting Windows Builds 2023-11-24 (#815)
Browse files Browse the repository at this point in the history
* git rm data

* Reduce number of Windows builds to 2; use vegastrike fork of vcpkg-local, instead of stephengtuggy fork

* vcpkg-configuration.json: Use https://github.com/vegastrike/vcpkg-local as default registry

* bootstrap.ps1: Use vegastrike fork of vcpkg-local, instead of stephengtuggy fork; update CMAKE_VERSION

* gh-actions-pr.yml: Add mantic, commented out; no more lunar or kinetic

* macos-ci.yml: Don't build on macOS 11 any longer as part of pipeline. Evidently homebrew no longer supports it, and runs REALLY slow in som cases

* script/bootstrap: Update to match latest version from build-system-docker-images, including the addition of Ubuntu mantic

* gh-actions-pr.yml: Uncomment Ubuntu mantic

* gh-actions-release.yml: Add Ubuntu Mantic, along with ENABLE_PIE parameter

* gh-actions-pr.yml: Allow failure for Mantic builds for now

* GH Actions, PR and Release: Omit old versions of Rocky Linux, Fedora, and openSUSE

* 4 GH Action files: Update action versions used; update which Linux versions we build on

* aligned.h, particle.cpp: Try to fix Issue 781, gcc-13 compilation

* aligned.h: Another try at fixing the GCC 13 compile errors
  • Loading branch information
stephengtuggy authored Nov 27, 2023
1 parent 524ea3b commit 6b5262e
Show file tree
Hide file tree
Showing 10 changed files with 293 additions and 407 deletions.
62 changes: 3 additions & 59 deletions .github/workflows/Windows-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,67 +22,11 @@ jobs:
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 1
build-type: Debug
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 1
build-type: Release
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 0
build-type: Debug
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 0
build-type: Release
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 1
# build-type: Debug
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 1
# build-type: Release
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 0
# build-type: Debug
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 0
# build-type: Release
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 1
build-type: Debug
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 1
build-type: Release
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 0
build-type: Debug
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 0
build-type: Release
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 1
# build-type: Debug
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 1
# build-type: Release
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 0
# build-type: Debug
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 0
# build-type: Release

env:
# Indicates the location of vcpkg
Expand All @@ -107,7 +51,7 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1

- name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'"
run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
Expand Down Expand Up @@ -140,7 +84,7 @@ jobs:
- name: install-vcpkg
#if: steps.cache.outputs.cache-hit != 'true'
run: |
git clone https://github.com/stephengtuggy/vcpkg-local.git ${{ env.VCPKG_ROOT }}
git clone https://github.com/vegastrike/vcpkg-local.git ${{ env.VCPKG_ROOT }}
${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat -disableMetrics
- name: run-build-script
Expand All @@ -155,7 +99,7 @@ jobs:
run: .\script\test.ps1 -Generator ${{ matrix.cmake-generator }} -EnablePIE ${{ matrix.enable-pie }} -BuildType ${{ matrix.build-type }}

- name: Upload test results
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
if: failure()
with:
name: test_results_xml
Expand Down
Loading

0 comments on commit 6b5262e

Please sign in to comment.