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.

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

0.9.x Updates 2024-04-18 to 04-22 by SGT #846

Merged
merged 33 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1b74c5f
build system refactors, improvements
Apr 18, 2024
9607bfa
3 C++ source files: fix some errors, bugs
Apr 18, 2024
2c033d6
Some logging refactoring, plus some work on the subscript-out-of-rang…
Apr 20, 2024
b3d5ac9
vs_logging.cpp: Fix a couple of compiler errors
Apr 21, 2024
c73ae6c
CMakePresets.json: Rename "windows-default" configuration to "windows…
Apr 21, 2024
1e7ce8b
Updated a bunch of files
Apr 23, 2024
6303ae0
.github/workflows/*.yml: Various updates, fixes, and syncing with oth…
Apr 23, 2024
bf7b219
Fix one more CI issue
Apr 23, 2024
a4cff20
Merge remote-tracking branch 'refs/remotes/upstream/0.9.x' into 0.9.x…
Apr 23, 2024
cee2a00
particle.cpp/.h: Initialize all fields; delete texture only if refcou…
Apr 23, 2024
658d82d
34 .cpp and .h files: Switch to VS_LOG_FLUSH_EXIT or similar where ap…
Apr 23, 2024
423a6a5
vs_logging.cpp: ...
Apr 23, 2024
4343ea9
vs_logging.cpp: ...
Apr 23, 2024
5a2aaf4
vs_logging.cpp: ...
Apr 23, 2024
b4d36b6
vs_logging.cpp: ...
Apr 23, 2024
452652d
vs_logging.cpp/.h: ...
Apr 23, 2024
2d05a1f
vs_logging.cpp: ...
Apr 23, 2024
f933e9b
Omitting old Fedora, Debian, and Red Hat builds, and including newer …
stephengtuggy Apr 25, 2024
b47f426
Fix dependabot.yml
stephengtuggy Apr 25, 2024
05ed4f5
CMakeLists.txt: Fix Python version for Rocky Linux 8.9 (and equivalen…
stephengtuggy Apr 25, 2024
9bfd1bd
mesh_gfx.cpp: Omit a line of code that was commented out anyway
stephengtuggy Apr 25, 2024
9691dfb
CMakeLists.txt: Get the package name right for Python 3.11 on CentOS …
stephengtuggy Apr 25, 2024
98924cb
script/bootstrap: Update to match latest version from build-system-do…
stephengtuggy Apr 25, 2024
4716afe
vs_logging.cpp/.h: Switch back to synchronous sinks. Also switch back…
stephengtuggy Apr 25, 2024
1fe5972
vs_logging.cpp: More fixes
stephengtuggy Apr 25, 2024
46109c3
Update bootstrap-on-macos.sh and brew-install-for-cmake.sh. Also comm…
stephengtuggy Apr 25, 2024
056b975
Update bootstrap-on-macos.sh again...
stephengtuggy Apr 25, 2024
e9461bc
CMakeLists.txt: Only link to `UTIL_LIB` if it was found
stephengtuggy Apr 25, 2024
0772ee8
vs_logging.cpp/.h: More fixes. Getting more console output now
stephengtuggy Apr 25, 2024
3c7ac3c
winsys.cpp: Have `winsys_exit(...)` actually exit the program
stephengtuggy Apr 25, 2024
9f0c393
More on logging, plus startup and shutdown sequences
stephengtuggy Apr 25, 2024
379f82e
vsfilesystem.cpp: ...
stephengtuggy Apr 25, 2024
2b21258
...
stephengtuggy Apr 25, 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
10 changes: 10 additions & 0 deletions .github/dependabot.yml
stephengtuggy marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
allow:
# Allow both direct and indirect updates for all packages
- dependency-type: "all"
58 changes: 31 additions & 27 deletions .github/workflows/Windows-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,58 +35,62 @@ jobs:
VCPKG_ROOT: '${{ github.workspace }}/v'
# Tells vcpkg where binary packages are stored.
VCPKG_DEFAULT_BINARY_CACHE: '${{ github.workspace }}/vbincache'
## Let's use GitHub Action cache as storage for the vcpkg Binary Caching feature.
#VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
# Let's use GitHub Action cache as storage for the vcpkg Binary Caching feature.
VCPKG_BINARY_SOURCES: 'x-gha,readwrite'
VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKG_DEFAULT_HOST_TRIPLET: x64-windows
PYTHONHOME: '${{ github.workspace }}/v/packages/python3_x64-windows/tools/python3'

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Set env vars needed for vcpkg to leverage the GitHub Action cache as a storage
# for Binary Caching.
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3

- name: Setup Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d #v5.1.0
with:
python-version: 3.11

- name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'"
run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
shell: bash

- name: install-cmake
uses: lukka/get-cmake@359fbae4b163fa01633e6de228fa7f2a31ab1fc7 #v3.26.1
uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa #v3.29.2
with:
cmakeVersion: 3.26.1
cmakeVersion: 3.29.2
ninjaVersion: 1.11.1

# # Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg's binary caching
# # when it is being run afterward by CMake.
# - name: restore-vcpkg
# uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
# with:
# # The first path is the location of vcpkg: it contains the vcpkg executable and data files, as long as the
# # built package archives (aka binary cache) which are located by VCPKG_DEFAULT_BINARY_CACHE env var.
# # The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
# path: |
# ${{ env.VCPKG_ROOT }}
# !${{ env.VCPKG_ROOT }}/buildtrees
# !${{ env.VCPKG_ROOT }}/packages
# !${{ env.VCPKG_ROOT }}/downloads
# !${{ env.VCPKG_ROOT }}/installed
# # The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
# key: |
# ${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}
# Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg's binary caching
# when it is being run afterward by CMake.
- name: restore-vcpkg
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
with:
# The first path is the location of vcpkg: it contains the vcpkg executable and data files, as long as the
# built package archives (aka binary cache) which are located by VCPKG_DEFAULT_BINARY_CACHE env var.
# The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
path: |
${{ env.VCPKG_ROOT }}
!${{ env.VCPKG_ROOT }}/buildtrees
!${{ env.VCPKG_ROOT }}/packages
!${{ env.VCPKG_ROOT }}/downloads
!${{ env.VCPKG_ROOT }}/installed
# The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
key: |
${{ matrix.os }}-${{ hashFiles( './engine/vcpkg.json' )}}

- name: install-vcpkg
#if: steps.cache.outputs.cache-hit != 'true'
if: steps.cache.outputs.cache-hit != 'true'
run: |
git clone https://github.com/vegastrike/vcpkg-local.git ${{ env.VCPKG_ROOT }}
git clone https://github.com/Microsoft/vcpkg.git ${{ env.VCPKG_ROOT }}
${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat -disableMetrics

- name: run-build-script
Expand All @@ -101,7 +105,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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
if: failure()
with:
name: test_results_xml
Expand Down
68 changes: 42 additions & 26 deletions .github/workflows/Windows-Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,18 @@ jobs:
VCPKG_ROOT: '${{ github.workspace }}/v'
# Tells vcpkg where binary packages are stored.
VCPKG_DEFAULT_BINARY_CACHE: '${{ github.workspace }}/vbincache'
## Let's use GitHub Action cache as storage for the vcpkg Binary Caching feature.
#VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
# Let's use GitHub Action cache as storage for the vcpkg Binary Caching feature.
VCPKG_BINARY_SOURCES: 'x-gha,readwrite'
VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKG_DEFAULT_HOST_TRIPLET: x64-windows
PYTHONHOME: '${{ github.workspace }}/v/packages/python3_x64-windows/tools/python3'
TAG_NAME: '${{ github.ref_name }}'

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Set env vars needed for vcpkg to leverage the GitHub Action cache as a storage
# for Binary Caching.
# Also process the `github.sha` value to produce the SHORT_SHA we'll need later
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
with:
script: |
const git_sha = context.sha.substring(0, 7)
Expand All @@ -64,40 +63,45 @@ jobs:

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3

- name: Setup Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d #v5.1.0
with:
python-version: 3.11

- name: "Create directory '${{ env.VCPKG_DEFAULT_BINARY_CACHE }}'"
run: mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
shell: bash

- name: install-cmake
uses: lukka/get-cmake@359fbae4b163fa01633e6de228fa7f2a31ab1fc7 #v3.26.1
uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa #v3.29.2
with:
cmakeVersion: 3.26.1
cmakeVersion: 3.29.2
ninjaVersion: 1.11.1

# # Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg's binary caching
# # when it is being run afterward by CMake.
# - name: restore-vcpkg
# uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
# with:
# # The first path is the location of vcpkg: it contains the vcpkg executable and data files, as long as the
# # built package archives (aka binary cache) which are located by VCPKG_DEFAULT_BINARY_CACHE env var.
# # The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
# path: |
# ${{ env.VCPKG_ROOT }}
# !${{ env.VCPKG_ROOT }}/buildtrees
# !${{ env.VCPKG_ROOT }}/packages
# !${{ env.VCPKG_ROOT }}/downloads
# !${{ env.VCPKG_ROOT }}/installed
# # The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
# key: |
# ${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}
# Restore vcpkg from the GitHub Action cache service. Note that packages are restored by vcpkg's binary caching
# when it is being run afterward by CMake.
- name: restore-vcpkg
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
with:
# The first path is the location of vcpkg: it contains the vcpkg executable and data files, as long as the
# built package archives (aka binary cache) which are located by VCPKG_DEFAULT_BINARY_CACHE env var.
# The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
path: |
${{ env.VCPKG_ROOT }}
!${{ env.VCPKG_ROOT }}/buildtrees
!${{ env.VCPKG_ROOT }}/packages
!${{ env.VCPKG_ROOT }}/downloads
!${{ env.VCPKG_ROOT }}/installed
# The key is composed in a way that it gets properly invalidated whenever a different version of vcpkg is being used.
key: |
${{ matrix.os }}-${{ hashFiles( './engine/vcpkg.json' )}}

- name: install-vcpkg
#if: steps.cache.outputs.cache-hit != 'true'
if: steps.cache.outputs.cache-hit != 'true'
run: |
git clone https://github.com/vegastrike/vcpkg-local.git ${{ env.VCPKG_ROOT }}
git clone https://github.com/Microsoft/vcpkg.git ${{ env.VCPKG_ROOT }}
${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat -disableMetrics

- name: run-build-script
Expand All @@ -111,6 +115,18 @@ jobs:
GTEST_COLOR: 1
run: .\script\test.ps1 -Generator ${{ matrix.cmake-generator }} -EnablePIE ${{ matrix.enable-pie }} -BuildType ${{ matrix.build-type }}

- name: Upload test results
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
if: failure()
with:
name: test_results_xml
path: ${{github.workspace}}/build/test-results/**/*.xml

#- name: Upload artifacts
# uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
# with:
# path: "${{ github.workspace }}/build/**/*.zip"

# TODO: Find/write a tool to upload release for Windows
# - name: Upload artifacts
# uses: skx/github-action-publish-binaries@44887b225ceca96efd8a912d39c09ad70312af31 # master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3
with:
fetch-depth: 2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fortify-on-demand-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3

- name: Fortify on Demand Scan
# You may pin to the exact commit or the version.
Expand Down
28 changes: 9 additions & 19 deletions .github/workflows/gh-actions-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ jobs:
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'debian:buster'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
allow_failure: false
- FROM: 'opensuse/leap:15.5'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'LEGACY'
Expand All @@ -101,27 +96,27 @@ jobs:
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
allow_failure: false
- FROM: 'fedora:38'
- FROM: 'fedora:40'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'LEGACY'
ENABLE_PIE: 'ON'
allow_failure: true
- FROM: 'fedora:38'
- FROM: 'fedora:40'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
allow_failure: true
- FROM: 'fedora:37'
- FROM: 'fedora:39'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
allow_failure: false
- FROM: 'rockylinux:9.1'
- FROM: 'rockylinux:9.3'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
allow_failure: false
- FROM: 'rockylinux:8.7'
- FROM: 'rockylinux:8.9'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
Expand Down Expand Up @@ -149,7 +144,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3
with:
fetch-depth: 2
submodules: false
Expand All @@ -176,16 +171,11 @@ jobs:
IS_RELEASE: 0
run: script/cibuild $FLAGS

# This is run from inside the Docker container, by script/docker-entrypoint.sh
# - name: Test
# working-directory: ${{github.workspace}}/build
# env:
# GTEST_OUTPUT: xml
# GTEST_COLOR: 1
# run: ctest -V
# The tests are run from inside the Docker container, by script/docker-entrypoint.sh.
# No need to run them explicitly from here.

- name: Upload test results
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
if: failure()
with:
name: test_results_xml
Expand Down
32 changes: 6 additions & 26 deletions .github/workflows/gh-actions-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ jobs:
fail-fast: false
matrix:
include:
- FROM: 'ubuntu:mantic'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'LEGACY'
ENABLE_PIE: 'OFF'
ARTIFACT_EXT: 'deb'
- FROM: 'ubuntu:mantic'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
Expand Down Expand Up @@ -71,16 +66,6 @@ jobs:
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
ARTIFACT_EXT: 'deb'
- FROM: 'debian:buster'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'OFF'
ARTIFACT_EXT: 'deb'
- FROM: 'opensuse/leap:15.5'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'LEGACY'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'opensuse/leap:15.5'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
Expand All @@ -91,35 +76,30 @@ jobs:
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:38'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'LEGACY'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:38'
- FROM: 'fedora:40'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'fedora:37'
- FROM: 'fedora:39'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'rockylinux:9.1'
- FROM: 'rockylinux:9.3'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'
- FROM: 'rockylinux:8.7'
- FROM: 'rockylinux:8.9'
COMPILER: 'clang'
OpenGL_GL_PREFERENCE: 'GLVND'
ENABLE_PIE: 'ON'
ARTIFACT_EXT: 'rpm'

steps:
- name: Check out repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f #v4.1.3
with:
fetch-depth: 2
submodules: false
Expand All @@ -142,7 +122,7 @@ jobs:
IS_RELEASE: 1
run: script/cibuild $FLAGS
- name: Upload the artifacts
uses: skx/github-action-publish-binaries@44887b225ceca96efd8a912d39c09ad70312af31 # master
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ARTIFACT_EXT: ${{ matrix.ARTIFACT_EXT }}
Expand Down
Loading
Loading