From 5b77d783399724c0712f014139a73bc2b5b5d74f Mon Sep 17 00:00:00 2001 From: memo Date: Sat, 14 Dec 2024 21:22:28 +0100 Subject: [PATCH] upgrade to sc4pac 0.5.0, set channel label and metadata source URL --- .github/workflows/sc4pac.yaml | 2 +- Makefile | 5 ++++- sc4pac-tools | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sc4pac.yaml b/.github/workflows/sc4pac.yaml index dc299d22..74a6733b 100644 --- a/.github/workflows/sc4pac.yaml +++ b/.github/workflows/sc4pac.yaml @@ -118,7 +118,7 @@ jobs: - name: Build sc4pac executable run: cd sc4pac-tools && sbt assembly && ./sc4pac --version - name: Build channel and website - run: make gh-pages-no-lint + run: make LABEL=Main gh-pages-no-lint - name: Setup Pages uses: actions/configure-pages@v4 - name: Upload artifact diff --git a/Makefile b/Makefile index ae9b2b6e..4043b1b2 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ # SC4PAC=sc4pac SC4PAC=./sc4pac-tools/sc4pac +# LABEL=Main +LABEL=Main-local + # Rebuild all .json files, the main.js file and update the gh-pages branch. # # This assumes that you have initialized the submodule `sc4pac-tools` with: @@ -26,7 +29,7 @@ gh-pages-no-lint: cp -p ./docs/index.html ./docs/*.md ./docs/.nojekyll ./gh-pages/ channel: - $(SC4PAC) channel build --output ./gh-pages/channel/ ./src/yaml/ + $(SC4PAC) channel build --label $(LABEL) --metadata-source-url https://github.com/memo33/sc4pac/blob/main/src/yaml/ --output ./gh-pages/channel/ ./src/yaml/ # Open e.g. http://localhost:8091/channel/?pkg=memo:essential-fixes host: diff --git a/sc4pac-tools b/sc4pac-tools index d8b1f817..aa8c16ae 160000 --- a/sc4pac-tools +++ b/sc4pac-tools @@ -1 +1 @@ -Subproject commit d8b1f81708548ff0bfea0c739f1550950819a803 +Subproject commit aa8c16ae789a6ff6e2fc018f384878e2ad6c66e8