upgrade to sc4pac 0.5.0, set channel label and metadata source URL

memo33 · Dec 14, 2024 · 5b77d78 · 5b77d78
1 parent 2ee4f40
commit 5b77d78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
+27 −2		CHANGELOG.md
+2 −2		Makefile
+250 −42		api.md
+4 −4		build.sbt
+1 −0		channel-testing/json/files/package-bFile.dat
+7 −1		channel-testing/json/metadata/memo/demo-package/1.0/pkg.json
+4 −1		channel-testing/json/metadata/sc4pacAsset/memo-demo-package-file-a-zip/1.0/pkg.json
+2 −2		channel-testing/json/sc4pac-channel-contents.json
+5 −0		channel-testing/yaml/memo/demo-package.yaml
+13 −2		channel-testing/yaml/templates/package-template-basic.yaml
+153 −13		shared/shared/src/main/scala/sc4pac/shared.scala
+146 −62		src/main/scala/sc4pac/ChannelUtil.scala
+7 −7		src/main/scala/sc4pac/Constants.scala
+168 −48		src/main/scala/sc4pac/Data.scala
+65 −30		src/main/scala/sc4pac/Downloader.scala
+14 −9		src/main/scala/sc4pac/FileCache.scala
+40 −11		src/main/scala/sc4pac/Find.scala
+4 −14		src/main/scala/sc4pac/Logger.scala
+81 −22		src/main/scala/sc4pac/MetadataRepository.scala
+41 −11		src/main/scala/sc4pac/Resolution.scala
+1 −25		src/main/scala/sc4pac/ResolutionContext.scala
+125 −54		src/main/scala/sc4pac/Sc4pac.scala
+346 −39		src/main/scala/sc4pac/api/api.scala
+8 −7		src/main/scala/sc4pac/api/logger.scala
+29 −7		src/main/scala/sc4pac/api/message.scala
+106 −26		src/main/scala/sc4pac/cli.scala
+5 −1		src/main/scala/sc4pac/error.scala
+101 −43		src/main/scala/sc4pac/extractor.scala
+11 −6		src/main/scala/sc4pac/package.scala
+129 −0		src/test/scala/sc4pac/ChannelSpec.scala
+42 −0		src/test/scala/sc4pac/DownloaderSpec.scala
+46 −18		src/test/scala/sc4pac/ExtractorSpec.scala
+1 −1		web/channel/styles.css
+16 −11		web/src/main/scala/sc4pac/web/ChannelPage.scala