Skip to content

Commit d442199

Browse files
update CI
1 parent 113224a commit d442199

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/tests.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ jobs:
3737
with:
3838
xmake-version: branch@dev
3939

40-
# Update xmake repository (in order to have the file that will be cached)
41-
- name: Update xmake repository
42-
run: xmake.exe repo --update
43-
4440
# Fetch xmake dephash
4541
- name: Retrieve dependencies hash
4642
id: dep_hash
@@ -55,7 +51,11 @@ jobs:
5551

5652
# Setup compilation mode and install project dependencies
5753
- name: Configure xmake and install dependencies
58-
run: xmake.exe config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes --verbose
54+
run: xmake.exe config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --cdm.format=false --yes --verbose
55+
56+
# Update xmake repository (in order to have the file that will be cached)
57+
- name: Update xmake repository
58+
run: xmake.exe repo --update
5959

6060
# Build the tests
6161
- name: Build cdm tests

Jenkinsfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
def sendSlack_notification(failed_stage)
22
{
3-
def name=powershell(returnStdout: true, script: "git log -1 --pretty=format:'%an'")
3+
def name=powershell(returnStdout: true, script: "git log -1 --pretty=format:'%an'")
44
def url= env.BUILD_URL.replace("localhost","10.37.0.121")
55
slackSend (color: "danger", channel: '#ci', message: "Build failed on stage ${failed_stage}: author: ${name} repository: ${env.GIT_URL} commit: ${env.GIT_COMMIT} see error at: ${url}console")
66
}
@@ -15,25 +15,26 @@ pipeline{
1515
{
1616
script{
1717
try{
18-
powershell "xmake -y"
18+
powershell "xmake config --cdm.format=false --mode=release"
19+
powershell "xmake build --yes"
1920
}catch(e){
2021
sendSlack_notification(env.STAGE_NAME)
2122
throw e
2223
}
23-
}
24+
}
2425
}
2526
}
2627
stage('test'){
2728
steps
2829
{
2930
script{
3031
try{
31-
powershell "xmake run"
32+
powershell "xmake run --group=test"
3233
}catch(e){
3334
sendSlack_notification(env.STAGE_NAME)
3435
throw e
3536
}
36-
}
37+
}
3738
}
3839
}
3940
}

xmake.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ add_requires("catch2 2.13.9")
44
set_arch("x64")
55
set_plat("windows")
66

7-
add_repositories("iconeus-repo https://github.com/Iconeus/xmake-repo.git")
8-
97
option("cdm.format")
108
set_default(true)
119
set_showmenu(true)
1210
set_description("Set this option if you wish for the source code to be auto-formatted")
1311
option_end()
1412

1513
if has_config("cdm.format") then
14+
add_repositories("iconeus-repo https://github.com/Iconeus/xmake-repo.git")
1615
add_requires("clang-format 16.0.6")
1716
end
1817

0 commit comments

Comments
 (0)