wip

Author: mxcl

.github/Dockerfile

@@ -7,6 +7,7 @@ COPY ./brewkit /work/brewkit
 COPY ./deno.jsonc /work/deno.jsonc
 COPY ./deno.lock /work/deno.lock
 RUN cd /work && find ./brewkit -name \*.ts | xargs pkgx deno cache
+RUN pkgx deno cache /work/.github/scripts/generate-versions
 
 FROM debian:buster-slim AS stage2
 COPY --from=stage1 /usr/local/bin/pkgx /usr/local/bin/pkgx

.github/actions/setup/action.yml

@@ -14,7 +14,7 @@ runs:
 
         "$PWD\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-        Get-ChildItem -Path brewkit -Recurse -Filter *.ts | ForEach-Object { .\\bin\\pkgx deno -q cache $_.FullName }
+        Get-ChildItem -Path brewkit .github/scripts/generate-versions -Recurse -Filter *.ts | ForEach-Object { .\\bin\\pkgx deno -q cache $_.FullName }
       shell: pwsh
       if: runner.os == 'Windows'
 
@@ -24,18 +24,15 @@ runs:
           # $HOME is different in the docker image vs. github actions
           ln -s /root/.pkgx $HOME
           ln -s /root/.cache $HOME
-          ./bin/pkg-convert
           ;;
         Darwin)
           curl https://pkgx.sh/$(uname)/$(uname -m).tgz | sudo tar xz -C /usr/local/bin
-          find brewkit .github -name \*.ts | xargs pkgx deno^2 --quiet cache
-          ./bin/pkg-convert
-          ;;
-        *)
-          # must be GNU make inside git-bash on Windows
-          make -f ./bin/pkg-convert
+          find brewkit -name \*.ts | xargs pkgx deno^2 --quiet cache
+          pkgx deno^2 --quiet cache .github/scripts/generate-versions
           ;;
         esac
 
+        ./bin/pkg-convert
+
         echo "$PWD/bin" >> $GITHUB_PATH
       shell: bash

.github/scripts/generate-versions.cmd

@@ -3,7 +3,7 @@ setlocal
 
 set SCRIPT_DIR=%~dp0
 
-pkgx -q deno run --ext=ts --quiet --allow-net --allow-read --allow-env --allow-sys "%SCRIPT_DIR%pkg-build" %*
+pkgx -q deno run --ext=ts --quiet --allow-net --allow-read --allow-env --allow-sys "%SCRIPT_DIR%generate-versions" %*
 if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
 
 endlocal

bin/pkg-convert

@@ -6,16 +6,12 @@ SRCROOT := $(abspath $(MAKEFILE_DIR)/..)
 PKG_FILES := $(shell find $(SRCROOT)/projects -name package.yml)
 OUTPUTS := $(PKG_FILES:$(SRCROOT)/projects/%=$(SRCROOT)/artifacts/pantry/projects/%)
 
-# ifeq ($(OS),Windows_NT)
-# 	DENO := deno.exe run -R --ext=ts
-# endif
-
 all: $(OUTPUTS)
 
 # Rule to process each package.yml file
 $(SRCROOT)/artifacts/pantry/projects/%: $(SRCROOT)/projects/%
 	@mkdir -p $(dir $@)
-	$(DENO) $(SRCROOT)/bin/pkg-convert-project "$<" > "$@"
+	$(SRCROOT)/bin/pkg-convert-project "$<" > "$@"
 
 debug:
 	@echo "PKG_FILES: $(PKG_FILES)"