Rename workflow src files to .github/workflows/*.ys

biojppm · Jan 6, 2025 · 542e352 · 542e352
1 parent 9c1ebfd
commit 542e352
Show file tree

Hide file tree

Showing 50 changed files with 54 additions and 48 deletions.
diff --git a/.github/workflows-src/README.md b/.github/workflows-src/README.md
diff --git a/.github/workflows/benchmarks.yml → .github/workflows/.benchmarks.yml b/.github/workflows/benchmarks.yml → .github/workflows/.benchmarks.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/benchmarks.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/benchmarks.ys
 
 name: benchmarks
 defaults:

diff --git a/.github/workflows/clang.yml → .github/workflows/.clang.yml b/.github/workflows/clang.yml → .github/workflows/.clang.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/clang.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/clang.ys
 
 name: clang
 defaults:

diff --git a/.github/workflows/clang_tidy.yml → .github/workflows/.clang_tidy.yml b/.github/workflows/clang_tidy.yml → .github/workflows/.clang_tidy.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/clang_tidy.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/clang_tidy.ys
 
 name: clang_tidy
 defaults:

diff --git a/.github/workflows/codeql.yml → .github/workflows/.codeql.yml b/.github/workflows/codeql.yml → .github/workflows/.codeql.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/codeql.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/codeql.ys
 
 name: CodeQL
 'on':

diff --git a/.github/workflows/coverage.yml → .github/workflows/.coverage.yml b/.github/workflows/coverage.yml → .github/workflows/.coverage.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/coverage.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/coverage.ys
 
 name: coverage
 defaults:

diff --git a/.github/workflows/emscripten.yml → .github/workflows/.emscripten.yml b/.github/workflows/emscripten.yml → .github/workflows/.emscripten.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/emscripten.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/emscripten.ys
 
 name: emscripten
 defaults:

diff --git a/.github/workflows/gcc.yml → .github/workflows/.gcc.yml b/.github/workflows/gcc.yml → .github/workflows/.gcc.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/gcc.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/gcc.ys
 
 name: gcc
 defaults:

diff --git a/.github/workflows/install.yml → .github/workflows/.install.yml b/.github/workflows/install.yml → .github/workflows/.install.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/install.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/install.ys
 
 name: test_install
 defaults:

diff --git a/.github/workflows/macosx.yml → .github/workflows/.macosx.yml b/.github/workflows/macosx.yml → .github/workflows/.macosx.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/macosx.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/macosx.ys
 
 name: macosx
 defaults:

diff --git a/.github/workflows/rarearchs.yml → .github/workflows/.rarearchs.yml b/.github/workflows/rarearchs.yml → .github/workflows/.rarearchs.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/rarearchs.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/rarearchs.ys
 
 name: rarearchs
 defaults:

diff --git a/.github/workflows/release.yml → .github/workflows/.release.yml b/.github/workflows/release.yml → .github/workflows/.release.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/release.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/release.ys
 
 name: release
 defaults:

diff --git a/.github/workflows/samples.yml → .github/workflows/.samples.yml b/.github/workflows/samples.yml → .github/workflows/.samples.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/samples.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/samples.ys
 
 name: samples
 defaults:

diff --git a/.github/workflows/windows.yml → .github/workflows/.windows.yml b/.github/workflows/windows.yml → .github/workflows/.windows.yml
@@ -1,4 +1,4 @@
-# DO NOT EDIT - GENERATED FROM .github/workflows-ys/windows.yml
+# DO NOT EDIT - GENERATED FROM .github/workflows/windows.ys
 
 name: windows
 defaults:

diff --git a/.github/workflows-src/Makefile → .github/workflows/Makefile b/.github/workflows-src/Makefile → .github/workflows/Makefile
@@ -4,8 +4,9 @@ YS_VERSION := 0.1.87
 YS_PREFIX := /tmp/rapidyaml
 YS := $(YS_PREFIX)/bin/ys-$(YS_VERSION)
 
-SOURCE_FILES := $(wildcard *.yml)
-TARGET_FILES := $(SOURCE_FILES:%=../workflows/%)
+SOURCE_FILES := $(wildcard *.ys)
+TARGET_FILES := $(SOURCE_FILES:%.ys=%.yml)
+TARGET_FILES := $(TARGET_FILES:%=.%)
 
 export PATH := $(YS_PREFIX)/bin:$(PATH)
 export YSPATH := $(shell pwd -P)/ys
@@ -16,30 +17,33 @@ default:
 build: $(TARGET_FILES)
 
 test: force build
-	@git diff --exit-code ../workflows && \
-	  echo -e '\nPASS - No normative changes to .github/workflows'
+	@git diff --exit-code .*.yml && \
+	  echo -e '\nPASS - No normative changes to .github/workflows/.*.yml'
 
 DIFF_ORIG_COMMIT ?= HEAD
 diff:
-	@for f in $(SOURCE_FILES); do \
-	  f=$${f##*/}; \
+	@for s in $(SOURCE_FILES); do \
+	  s=$${s##*/}; \
+	  t=$${s%.yml}; \
+	  [[ $$(git show $(DIFF_ORIG_COMMIT):.github/workflows/.$$t \
+	          2>/dev/null) ]] && t=.$$t; \
 	  diff -u --color=auto \
 	    <(yq -P 'sort_keys(..)' \
-	         -o=props <(git show $(DIFF_ORIG_COMMIT):.github/workflows/$$f) | \
+	         -o=props <(git show $(DIFF_ORIG_COMMIT):.github/workflows/$$t) | \
 		 grep -Ev '(^$$|^#)' \
 	     ) \
 	    <(yq -P 'sort_keys(..)' \
-	         -o=props ../workflows/$$f | \
+	         -o=props ../workflows/$$s | \
 		 grep -Ev '(^$$|^#)'\
 	     ); \
 	  done
 
 force:
-	touch *.yml
+	touch *.ys
 
-../workflows/%: % $(YS)
+.%.yml: %.ys $(YS)
 	@[ -f $@ ] && chmod a+w $@
-	@echo "# DO NOT EDIT - GENERATED FROM .github/workflows-ys/$<" > $@
+	@echo "# DO NOT EDIT - GENERATED FROM .github/workflows/$<" > $@
 	@echo >> $@
 	ys -Y $< >> $@
 	@chmod a-w $@

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -0,0 +1,25 @@
+`.github/workflows/*.ys`
+========================
+
+Use YAMLScript for GHA workflows
+
+
+## Synopsis
+
+```bash
+$ make build
+$ make test
+$ make diff
+```
+
+
+## Description
+
+Edit the `*.ys` files in this directory and run `make build` to generate the
+files used by GitHub Actions (`.*.yml`).
+
+Running `make test` runs `make build` and shows the diff in the of the workflow
+`.foo.yml` files.
+
+If you are only refactoring the `*.ys` source files, you should see no diff
+when you run this.
diff --git a/...orkflows-src/bash/benchmarks-install.bash → ...ub/workflows/bash/benchmarks-install.bash b/...orkflows-src/bash/benchmarks-install.bash → ...ub/workflows/bash/benchmarks-install.bash
diff --git a/...ub/workflows-src/bash/benchmarks-run.bash → .github/workflows/bash/benchmarks-run.bash b/...ub/workflows-src/bash/benchmarks-run.bash → .github/workflows/bash/benchmarks-run.bash
diff --git a/...workflows-src/bash/benchmarks-vars-1.bash → ...hub/workflows/bash/benchmarks-vars-1.bash b/...workflows-src/bash/benchmarks-vars-1.bash → ...hub/workflows/bash/benchmarks-vars-1.bash
diff --git a/...workflows-src/bash/benchmarks-vars-2.bash → ...hub/workflows/bash/benchmarks-vars-2.bash b/...workflows-src/bash/benchmarks-vars-2.bash → ...hub/workflows/bash/benchmarks-vars-2.bash
diff --git a/...ub/workflows-src/bash/clang-checkout.bash → .github/workflows/bash/clang-checkout.bash b/...ub/workflows-src/bash/clang-checkout.bash → .github/workflows/bash/clang-checkout.bash
diff --git a/.github/workflows-src/bash/gcc-checkout.bash → .github/workflows/bash/gcc-checkout.bash b/.github/workflows-src/bash/gcc-checkout.bash → .github/workflows/bash/gcc-checkout.bash
diff --git a/...hub/workflows-src/bash/gcc-configure.bash → .github/workflows/bash/gcc-configure.bash b/...hub/workflows-src/bash/gcc-configure.bash → .github/workflows/bash/gcc-configure.bash
diff --git a/...workflows-src/bash/install-configure.bash → ...hub/workflows/bash/install-configure.bash b/...workflows-src/bash/install-configure.bash → ...hub/workflows/bash/install-configure.bash
diff --git a/...orkflows-src/bash/install-preinstall.bash → ...ub/workflows/bash/install-preinstall.bash b/...orkflows-src/bash/install-preinstall.bash → ...ub/workflows/bash/install-preinstall.bash
diff --git a/...lows-src/bash/rarearchs-test-install.bash → ...orkflows/bash/rarearchs-test-install.bash b/...lows-src/bash/rarearchs-test-install.bash → ...orkflows/bash/rarearchs-test-install.bash
diff --git a/...orkflows-src/bash/rarearchs-test-run.bash → ...ub/workflows/bash/rarearchs-test-run.bash b/...orkflows-src/bash/rarearchs-test-run.bash → ...ub/workflows/bash/rarearchs-test-run.bash
diff --git a/.../bash/release-create-source-packages.bash → .../bash/release-create-source-packages.bash b/.../bash/release-create-source-packages.bash → .../bash/release-create-source-packages.bash
diff --git a/...workflows-src/bash/release-normalize.bash → ...hub/workflows/bash/release-normalize.bash b/...workflows-src/bash/release-normalize.bash → ...hub/workflows/bash/release-normalize.bash
diff --git a/...lows-src/bash/release-package-python.bash → ...orkflows/bash/release-package-python.bash b/...lows-src/bash/release-package-python.bash → ...orkflows/bash/release-package-python.bash
diff --git a/...workflows-src/bash/release-save-vars.bash → ...hub/workflows/bash/release-save-vars.bash b/...workflows-src/bash/release-save-vars.bash → ...hub/workflows/bash/release-save-vars.bash
diff --git a/...ws-src/bash/release-shared-normalize.bash → ...kflows/bash/release-shared-normalize.bash b/...ws-src/bash/release-shared-normalize.bash → ...kflows/bash/release-shared-normalize.bash
diff --git a/...ws-src/bash/release-test-with-python.bash → ...kflows/bash/release-test-with-python.bash b/...ws-src/bash/release-test-with-python.bash → ...kflows/bash/release-test-with-python.bash
diff --git a/...ub/workflows-src/bash/release-vars-1.bash → .github/workflows/bash/release-vars-1.bash b/...ub/workflows-src/bash/release-vars-1.bash → .github/workflows/bash/release-vars-1.bash
diff --git a/...ub/workflows-src/bash/release-vars-2.bash → .github/workflows/bash/release-vars-2.bash b/...ub/workflows-src/bash/release-vars-2.bash → .github/workflows/bash/release-vars-2.bash
diff --git a/.github/workflows-src/benchmarks.yml → .github/workflows/benchmarks.ys b/.github/workflows-src/benchmarks.yml → .github/workflows/benchmarks.ys
diff --git a/.github/workflows-src/clang.yml → .github/workflows/clang.ys b/.github/workflows-src/clang.yml → .github/workflows/clang.ys
diff --git a/.github/workflows-src/clang_tidy.yml → .github/workflows/clang_tidy.ys b/.github/workflows-src/clang_tidy.yml → .github/workflows/clang_tidy.ys
diff --git a/.github/workflows-src/codeql.yml → .github/workflows/codeql.ys b/.github/workflows-src/codeql.yml → .github/workflows/codeql.ys
diff --git a/.github/workflows-src/coverage.yml → .github/workflows/coverage.ys b/.github/workflows-src/coverage.yml → .github/workflows/coverage.ys
diff --git a/.github/workflows-src/emscripten.yml → .github/workflows/emscripten.ys b/.github/workflows-src/emscripten.yml → .github/workflows/emscripten.ys
diff --git a/.github/workflows-src/gcc.yml → .github/workflows/gcc.ys b/.github/workflows-src/gcc.yml → .github/workflows/gcc.ys
diff --git a/.github/workflows-src/install.yml → .github/workflows/install.ys b/.github/workflows-src/install.yml → .github/workflows/install.ys
diff --git a/.github/workflows-src/macosx.yml → .github/workflows/macosx.ys b/.github/workflows-src/macosx.yml → .github/workflows/macosx.ys
diff --git a/.github/workflows-src/rarearchs.yml → .github/workflows/rarearchs.ys b/.github/workflows-src/rarearchs.yml → .github/workflows/rarearchs.ys
diff --git a/.github/workflows-src/release.yml → .github/workflows/release.ys b/.github/workflows-src/release.yml → .github/workflows/release.ys
diff --git a/.github/workflows-src/samples.yml → .github/workflows/samples.ys b/.github/workflows-src/samples.yml → .github/workflows/samples.ys
diff --git a/.github/workflows-src/share/env.yaml → .github/workflows/share/env.yaml b/.github/workflows-src/share/env.yaml → .github/workflows/share/env.yaml
diff --git a/.github/workflows-src/windows.yml → .github/workflows/windows.ys b/.github/workflows-src/windows.yml → .github/workflows/windows.ys
diff --git a/.github/workflows-src/ys/common.ys → .github/workflows/ys/common.ys b/.github/workflows-src/ys/common.ys → .github/workflows/ys/common.ys
@@ -3,7 +3,7 @@
 
 #----------------------------------------------------------
 defn workflow-setup(name=nil overrides={})::
-  name =: name || FILE.replace(/.*\//).replace(/\.yml$/)
+  name =: name || FILE.replace(/.*\//).replace(/\.ys$/)
   name:: name
   defaults:
     run: