fix release workflow + other minor YS-CI changes

This commit is contained in:
Joao Paulo Magalhaes
2025-02-15 13:01:21 +00:00
parent e65999dc4d
commit a84cdf5c72
16 changed files with 63 additions and 24 deletions

View File

@@ -1,12 +0,0 @@
pwd
ls -lFhp
source vars.sh
echo SRC_TAG=$SRC_TAG
echo SRC_VERSION=$SRC_VERSION
id=${PROJ_PKG_NAME}${SRC_VERSION}
name=${id}-src
mkdir -p assets
git-archive-all --prefix $name assets/$name.tgz
git-archive-all --prefix $name assets/$name.zip
python --version
python tools/amalgamate.py assets/$id.hpp

View File

@@ -23,9 +23,9 @@ env:
# git push -f --tags origin )
jobs:
gettag:
:: setup-job('release' 'gettag')
continue-on-error: false
runs-on: ubuntu-latest
steps:
- :: checkout-action
@@ -35,7 +35,6 @@ jobs:
# create source packages
src:
:: setup-job('release' 'src')
continue-on-error: false
needs: gettag
runs-on: ubuntu-latest
steps:
@@ -47,7 +46,19 @@ jobs:
- name: Install requirements
run: sudo -E pip install git-archive-all
- name: Create source packages
run:: bash('release-create-source-packages')
run: |
pwd
ls -lFhp
source vars.sh
echo SRC_TAG=$SRC_TAG
echo SRC_VERSION=$SRC_VERSION
id=${PROJ_PKG_NAME}${SRC_VERSION}
name=${id}-src
mkdir -p assets
git-archive-all --prefix $name assets/$name.tgz
git-archive-all --prefix $name assets/$name.zip
python --version
python tools/amalgamate.py assets/$id.hpp
- name: Save source artifacts
uses: actions/upload-artifact@v4
with: {name: assets-src, path: assets/}
@@ -56,7 +67,6 @@ jobs:
# create c++ packages
cpp:
:: setup-job('release' 'cpp')
continue-on-error: false
name: cpp/${{matrix.config.os}}/${{matrix.config.gen}}
needs: gettag
runs-on: ${{matrix.config.os}}
@@ -118,7 +128,6 @@ jobs:
python_src:
:: setup-job('release' 'python_src')
continue-on-error: false
name: python/src
runs-on: ubuntu-latest
steps:
@@ -136,7 +145,6 @@ jobs:
python_wheels:
:: setup-job('release' 'python_wheels')
continue-on-error: false
name: ${{matrix.config.name}}
runs-on: ${{matrix.config.os}}
env:
@@ -305,7 +313,6 @@ jobs:
#----------------------------------------------------------------------------
release:
:: setup-job('release' 'release')
continue-on-error: false
runs-on: ubuntu-latest
needs: [merge_artifacts]
steps:
@@ -350,6 +357,7 @@ jobs:
if: contains(github.ref, 'tags/v')
run: mv -fv dist/*src.zip assets/.
# Github
- :: version-get-vars
- name: Create Github Release
if: contains(github.ref, 'tags/v')
id: create_release
@@ -358,8 +366,8 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
tag_name: ${{github.ref}}
release_name: Release ${{steps.vars.outputs.SRC_VERSION}}
body_path: ${{steps.vars.outputs.SRC_VERSION_BODY}}
release_name: Release ${{env.SRC_VERSION}}
body_path: ${{env.SRC_VERSION_BODY}}
draft: true
prerelease: ${{contains(github.ref, 'rc')}}
- name: Upload assets to Github Release

View File

@@ -20,6 +20,7 @@ defn workflow-setup(name=nil overrides={})::
pull_request:
branches: [master]
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON
@@ -142,6 +143,7 @@ version-env =::
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON
@@ -76,6 +77,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -146,6 +148,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -83,6 +83,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -117,6 +118,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -213,6 +215,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -495,6 +498,7 @@ jobs:
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
@@ -540,6 +544,30 @@ jobs:
- name: Move Python packages to assets folder
if: contains(github.ref, 'tags/v')
run: mv -fv dist/*src.zip assets/.
- name: Download vars.sh
uses: actions/download-artifact@v4
with:
name: vars.sh
path: ./
- name: Show vars.sh
run: cat vars.sh
- name: Source vars.sh
run: source vars.sh
- name: Env (common)
run: |
source vars.sh
echo "SRC_TAG=$SRC_TAG" >> $GITHUB_ENV
echo "SRC_VERSION=$SRC_VERSION" >> $GITHUB_ENV
- name: Env (from tag)
if: contains(github.ref, 'tags/v')
run: |
source vars.sh
echo "SRC_VERSION_BODY=$SRC_VERSION_BODY" >> $GITHUB_ENV
- name: Variables (from commit, no tag)
if: ${{ !contains(github.ref, 'tags/v') }}
run: echo 'nothing to do'
- name: Verify vars.sh
run: env | grep SRC
- name: Create Github Release
if: contains(github.ref, 'tags/v')
id: create_release
@@ -548,8 +576,8 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
tag_name: ${{github.ref}}
release_name: Release ${{steps.vars.outputs.SRC_VERSION}}
body_path: ${{steps.vars.outputs.SRC_VERSION_BODY}}
release_name: Release ${{env.SRC_VERSION}}
body_path: ${{env.SRC_VERSION_BODY}}
draft: true
prerelease: ${{contains(github.ref, 'rc')}}
- name: Upload assets to Github Release

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON

View File

@@ -13,6 +13,7 @@ defaults:
branches:
- master
env:
PROJ_PKG_NAME: rapidyaml-
PROJ_PFX_TARGET: ryml-
PROJ_PFX_CMAKE: RYML_
CMAKE_FLAGS: -DRYML_TEST_SUITE=ON