From cab15a5b61cb6cd428734937d5ec4fab5c8646a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 2 Feb 2024 18:18:15 +0100 Subject: [PATCH 1/4] ci/release: use github.ref_name instead of probing the VERSION file This will allow building releases from any branches without conflicts with existing tags. --- .github/workflows/release_linux.yml | 4 ++-- .github/workflows/release_macos.yml | 4 ++-- .github/workflows/release_windows.yml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 73c3184cb..4b6a2a6d9 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -47,6 +47,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - output_file="appimage/${{ matrix.tool_fullname }}-$(cat VERSION)-x86_64.AppImage" + output_file="appimage/${{ matrix.tool_fullname }}-${{ github.ref_name }}-x86_64.AppImage" mv appimage/${{ matrix.tool_fullname }}-x86_64.AppImage $output_file - gh release upload v$(cat VERSION) $output_file + gh release upload ${{ github.ref_name }} $output_file diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index a848a0845..efd88c6d9 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -54,6 +54,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - output_file="${{ matrix.tool_fullname }}-$(cat VERSION)-x86_64.dmg" + output_file="${{ matrix.tool_fullname }}-${{ github.ref_name }}-x86_64.dmg" mv ${{ matrix.tool }}.dmg $output_file - gh release upload v$(cat VERSION) $output_file + gh release upload ${{ github.ref_name }} $output_file diff --git a/.github/workflows/release_windows.yml b/.github/workflows/release_windows.yml index 82d861314..2754c0c9c 100644 --- a/.github/workflows/release_windows.yml +++ b/.github/workflows/release_windows.yml @@ -66,7 +66,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - $version = $(Get-Content -TotalCount 1 .\VERSION) - $output_file = "dist/${{ matrix.tool_fullname }}-$version-x86_64.zip" + $output_file = "dist/${{ matrix.tool_fullname }}-${{ github.ref_name }}-x86_64.zip" mv dist/${{ matrix.tool_fullname }}.zip $output_file - gh release upload "v$version" $output_file + gh release upload ${{ github.ref_name }} $output_file From 1a518b2d2638e1373989c3115af161edf51ed220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 2 Feb 2024 17:47:31 +0100 Subject: [PATCH 2/4] ci/release: add ability to manually trigger a release --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aed7d4554..29cc94ec9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ on: push: tags: - "v**" + workflow_dispatch: jobs: release: From f5c9f575e9fc18ddb215ff31a4362c24c93a7a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 2 Feb 2024 18:01:21 +0100 Subject: [PATCH 3/4] scripts: tolerate unknown version in the release changelog script This allows triggering the release workflow from a random branch for testing purpose. --- scripts/release-changelog.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release-changelog.py b/scripts/release-changelog.py index 8e36e456d..5770089ce 100755 --- a/scripts/release-changelog.py +++ b/scripts/release-changelog.py @@ -24,7 +24,6 @@ output_lines.append(next(iter_lines)) except StopIteration: print(f"Version {version} not found in the changelog", file=sys.stderr) - sys.exit(1) output_lines += itertools.takewhile(lambda line: not line.startswith(f"## ["), iter_lines) From 7b3148cabf421c4de996120be7278504db2c34ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 2 Feb 2024 18:40:59 +0100 Subject: [PATCH 4/4] yolo --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8cd23c3fd..d7ecbe8e0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # nope.gl +YOLO + `nope.gl` is a graphics engine for building and rendering graph-based scenes. It is designed to run on both desktop (Linux, OSX, Windows) and mobile (Android, iOS).