Skip to content

Commit

Permalink
Merge main into feat-new-function-declaration
Browse files Browse the repository at this point in the history
  • Loading branch information
delasy committed Feb 25, 2025
2 parents b8b26ef + 7ee96d7 commit f06b063
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/cross-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,22 @@ jobs:
config:
- os: ubuntu-20.04
platform: macos
arch: x86_64
- os: ubuntu-22.04
platform: macos
arch: x86_64
- os: ubuntu-24.04
platform: macos
arch: x86_64
- os: ubuntu-20.04
platform: macos
arch: arm64
- os: ubuntu-22.04
platform: macos
arch: arm64
- os: ubuntu-24.04
platform: macos
arch: arm64
- os: ubuntu-20.04
platform: linux
- os: ubuntu-22.04
Expand All @@ -42,7 +54,7 @@ jobs:
- run: sudo apt-get install mingw-w64 ninja-build
- run: curl -fsSL https://cdn.thelang.io/deps.tar.gz | sudo tar -C /usr/local -xz
- if: matrix.config.platform == 'macos'
run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}/$(uname -m)" >> $GITHUB_ENV
run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}/${{ matrix.config.arch }}" >> $GITHUB_ENV
- if: matrix.config.platform != 'macos'
run: echo "THE_DEPS_DIR=/usr/local/the/cross-compile/${{ matrix.config.platform }}" >> $GITHUB_ENV
- run: echo "/usr/local/the/osxcross/bin" >> $GITHUB_PATH
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

cmake_minimum_required(VERSION 3.14)
project(the VERSION 0.14.14)
project(the VERSION 0.14.15)

option(BUILD_COVERAGE "Build coverage" OFF)
option(BUILD_TESTS "Build test programs" OFF)
Expand Down

0 comments on commit f06b063

Please sign in to comment.