Skip to content

Commit 5d60c9e

Browse files
committed
Use Jamba 7.1.3
- added CI step
1 parent 9635f81 commit 5d60c9e

File tree

3 files changed

+75
-13
lines changed

3 files changed

+75
-13
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Build (macOS)
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
tags-ignore:
8+
- '*'
9+
10+
jobs:
11+
run_tests:
12+
13+
runs-on: macos-14
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Configure Project
21+
working-directory: ${{github.workspace}}
22+
run: ${{github.workspace}}/configure.py -- -DJAMBA_DOWNLOAD_VSTSDK=ON
23+
24+
- name: Run test/validate/archive (Release)
25+
working-directory: ${{github.workspace}}/build
26+
run: ./jamba.sh --release -b test validate archive
27+
28+
- name: Upload Build Artifacts
29+
uses: actions/upload-artifact@v4
30+
with:
31+
name: archive-macos
32+
path: ${{github.workspace}}/build/*.zip
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Build (Windows)
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
tags-ignore:
8+
- '*'
9+
10+
jobs:
11+
run_tests:
12+
runs-on: windows-2022
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Configure Project
20+
working-directory: ${{github.workspace}}
21+
run: python ${{github.workspace}}\configure.py -G "Visual Studio 17 2022" -- -DJAMBA_DOWNLOAD_VSTSDK=ON -A x64
22+
23+
- name: Run test/validate/archive (Release)
24+
working-directory: ${{github.workspace}}/build
25+
run: .\jamba.bat --release -b test validate archive
26+
27+
- name: Upload Build Artifacts
28+
uses: actions/upload-artifact@v4
29+
with:
30+
name: archive-windows
31+
path: ${{github.workspace}}/build/*.zip

fetch_jamba.cmake

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,40 @@ cmake_minimum_required(VERSION 3.19)
33
include(FetchContent)
44

55
set(JAMBA_GIT_REPO "https://github.com/pongasoft/jamba" CACHE STRING "Jamba git repository url")
6-
set(JAMBA_GIT_TAG v7.1.2 CACHE STRING "Jamba git tag")
7-
set(JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO}/archive/refs/tags/v7.1.2.zip" CACHE STRING "Jamba download url")
8-
set(JAMBA_DOWNLOAD_URL_HASH "SHA256=ad297edbfd6aaadea8a1762d58fff622c6e7275a3881c2d89e7b0e451ed757b2" CACHE STRING "Jamba download url hash")
6+
set(JAMBA_GIT_TAG v7.1.3 CACHE STRING "Jamba git tag")
7+
set(JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO}/archive/refs/tags/v7.1.3.zip" CACHE STRING "Jamba download url")
8+
set(JAMBA_DOWNLOAD_URL_HASH "SHA256=c177c031afebf97e3c8ccaf70e9de09a1cfbe4d4503e45106612cceef03f3fe0" CACHE STRING "Jamba download url hash")
99

1010
if(JAMBA_ROOT_DIR)
1111
message(STATUS "Using jamba from local ${JAMBA_ROOT_DIR}")
12-
FetchContent_Populate(jamba
13-
QUIET
14-
SOURCE_DIR "${JAMBA_ROOT_DIR}"
15-
BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build"
12+
FetchContent_Declare(jamba
13+
SOURCE_DIR "${JAMBA_ROOT_DIR}"
14+
SOURCE_SUBDIR "do_not_make_available" # invalid folder to not execute jamba/CMakeLists.txt
1615
)
1716
else()
1817
if(JAMBA_DOWNLOAD_URL STREQUAL "" OR JAMBA_DOWNLOAD_URL_HASH STREQUAL "")
1918
message(STATUS "Fetching jamba from ${JAMBA_GIT_REPO}/tree/${JAMBA_GIT_TAG}")
20-
FetchContent_Populate(jamba
21-
QUIET
19+
FetchContent_Declare(jamba
2220
GIT_REPOSITORY ${JAMBA_GIT_REPO}
2321
GIT_TAG ${JAMBA_GIT_TAG}
2422
GIT_CONFIG advice.detachedHead=false
2523
GIT_SHALLOW true
2624
SOURCE_DIR "${CMAKE_BINARY_DIR}/jamba"
27-
BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build"
25+
SOURCE_SUBDIR "do_not_make_available"
2826
)
2927
else()
3028
message(STATUS "Fetching jamba from ${JAMBA_DOWNLOAD_URL}")
31-
FetchContent_Populate(jamba
32-
QUIET
29+
FetchContent_Declare(jamba
3330
URL "${JAMBA_DOWNLOAD_URL}"
3431
URL_HASH "${JAMBA_DOWNLOAD_URL_HASH}"
3532
DOWNLOAD_EXTRACT_TIMESTAMP true
3633
SOURCE_DIR "${CMAKE_BINARY_DIR}/jamba"
37-
BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build"
34+
SOURCE_SUBDIR "do_not_make_available"
3835
)
3936
endif()
4037
endif()
4138

39+
FetchContent_MakeAvailable(jamba)
40+
4241
set(JAMBA_ROOT_DIR ${jamba_SOURCE_DIR})
4342

0 commit comments

Comments
 (0)