Skip to content

Commit a84cdf5

Browse files
committed
fix release workflow + other minor YS-CI changes
1 parent e65999d commit a84cdf5

16 files changed

Lines changed: 63 additions & 24 deletions

.github/workflows-in/bash/release-create-source-packages.bash

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows-in/release.ys

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ env:
2323
# git push -f --tags origin )
2424

2525
jobs:
26+
2627
gettag:
2728
:: setup-job('release' 'gettag')
28-
continue-on-error: false
2929
runs-on: ubuntu-latest
3030
steps:
3131
- :: checkout-action
@@ -35,7 +35,6 @@ jobs:
3535
# create source packages
3636
src:
3737
:: setup-job('release' 'src')
38-
continue-on-error: false
3938
needs: gettag
4039
runs-on: ubuntu-latest
4140
steps:
@@ -47,7 +46,19 @@ jobs:
4746
- name: Install requirements
4847
run: sudo -E pip install git-archive-all
4948
- name: Create source packages
50-
run:: bash('release-create-source-packages')
49+
run: |
50+
pwd
51+
ls -lFhp
52+
source vars.sh
53+
echo SRC_TAG=$SRC_TAG
54+
echo SRC_VERSION=$SRC_VERSION
55+
id=${PROJ_PKG_NAME}${SRC_VERSION}
56+
name=${id}-src
57+
mkdir -p assets
58+
git-archive-all --prefix $name assets/$name.tgz
59+
git-archive-all --prefix $name assets/$name.zip
60+
python --version
61+
python tools/amalgamate.py assets/$id.hpp
5162
- name: Save source artifacts
5263
uses: actions/upload-artifact@v4
5364
with: {name: assets-src, path: assets/}
@@ -56,7 +67,6 @@ jobs:
5667
# create c++ packages
5768
cpp:
5869
:: setup-job('release' 'cpp')
59-
continue-on-error: false
6070
name: cpp/${{matrix.config.os}}/${{matrix.config.gen}}
6171
needs: gettag
6272
runs-on: ${{matrix.config.os}}
@@ -118,7 +128,6 @@ jobs:
118128

119129
python_src:
120130
:: setup-job('release' 'python_src')
121-
continue-on-error: false
122131
name: python/src
123132
runs-on: ubuntu-latest
124133
steps:
@@ -136,7 +145,6 @@ jobs:
136145

137146
python_wheels:
138147
:: setup-job('release' 'python_wheels')
139-
continue-on-error: false
140148
name: ${{matrix.config.name}}
141149
runs-on: ${{matrix.config.os}}
142150
env:
@@ -305,7 +313,6 @@ jobs:
305313
#----------------------------------------------------------------------------
306314
release:
307315
:: setup-job('release' 'release')
308-
continue-on-error: false
309316
runs-on: ubuntu-latest
310317
needs: [merge_artifacts]
311318
steps:
@@ -350,6 +357,7 @@ jobs:
350357
if: contains(github.ref, 'tags/v')
351358
run: mv -fv dist/*src.zip assets/.
352359
# Github
360+
- :: version-get-vars
353361
- name: Create Github Release
354362
if: contains(github.ref, 'tags/v')
355363
id: create_release
@@ -358,8 +366,8 @@ jobs:
358366
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
359367
with:
360368
tag_name: ${{github.ref}}
361-
release_name: Release ${{steps.vars.outputs.SRC_VERSION}}
362-
body_path: ${{steps.vars.outputs.SRC_VERSION_BODY}}
369+
release_name: Release ${{env.SRC_VERSION}}
370+
body_path: ${{env.SRC_VERSION_BODY}}
363371
draft: true
364372
prerelease: ${{contains(github.ref, 'rc')}}
365373
- name: Upload assets to Github Release

.github/workflows-in/ys/common.ys

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ defn workflow-setup(name=nil overrides={})::
2020
pull_request:
2121
branches: [master]
2222
env:
23+
PROJ_PKG_NAME: rapidyaml-
2324
PROJ_PFX_TARGET: ryml-
2425
PROJ_PFX_CMAKE: RYML_
2526
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON
@@ -142,6 +143,7 @@ version-env =::
142143
- name: Env (from tag)
143144
if: contains(github.ref, 'tags/v')
144145
run: |
146+
source vars.sh
145147
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
146148
- name: Variables (from commit, no tag)
147149
if: ${{ !contains(github.ref, 'tags/v') }}

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON
@@ -76,6 +77,7 @@ jobs:
7677
- name: Env (from tag)
7778
if: contains(github.ref, 'tags/v')
7879
run: |
80+
source vars.sh
7981
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
8082
- name: Variables (from commit, no tag)
8183
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -146,6 +148,7 @@ jobs:
146148
- name: Env (from tag)
147149
if: contains(github.ref, 'tags/v')
148150
run: |
151+
source vars.sh
149152
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
150153
- name: Variables (from commit, no tag)
151154
if: ${{ !contains(github.ref, 'tags/v') }}

.github/workflows/clang.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

.github/workflows/clang_tidy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

.github/workflows/coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

.github/workflows/emscripten.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

.github/workflows/gcc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

.github/workflows/infra.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ defaults:
1313
branches:
1414
- master
1515
env:
16+
PROJ_PKG_NAME: rapidyaml-
1617
PROJ_PFX_TARGET: ryml-
1718
PROJ_PFX_CMAKE: RYML_
1819
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

0 commit comments

Comments
 (0)