🚚dev → dev-nyanperidot🚚

.githooks/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+make -C .github/workflows/generator
+git add .github/workflows
+

.github/actions/checkbuild-baselayer/Dockerfile

@@ -1,5 +1,8 @@
 FROM rust:latest
 
+# あとでlatest自動取得とかしたいけど面倒だから一旦これでいいや
+RUN curl -o /cargo-json-gha-translator -L https://github.com/Pctg-x8/cargo-json-gha-translator/releases/download/v0.1.3/cargo-json-gha-translator && chmod +x /cargo-json-gha-translator
+
 ADD entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 

.github/actions/checkbuild-baselayer/entrypoint.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -xe
 
+set -o pipefail
+
 export CARGO_TARGET_DIR=$GITHUB_WORKSPACE/.buildcache/target
 export CARGO_HOME=$GITHUB_WORKSPACE/.buildcache
 
-cargo check --verbose --features=bedrock/VK_EXT_debug_report
+cd base
+cargo check --verbose --features=bedrock/VK_EXT_debug_report --message-format=json | /cargo-json-gha-translator
+cargo check --verbose --features=bedrock/VK_EXT_debug_report,mt --message-format=json | /cargo-json-gha-translator

.github/actions/checkbuild-subdir/Dockerfile

@@ -1,5 +1,8 @@
 FROM rust:latest
 
+# あとでlatest自動取得とかしたいけど面倒だから一旦これでいいや
+RUN curl -o /cargo-json-gha-translator -L https://github.com/Pctg-x8/cargo-json-gha-translator/releases/download/v0.1.3/cargo-json-gha-translator && chmod +x /cargo-json-gha-translator
+
 ADD tester.sh /
 ADD checker.sh /
 ADD find-test-code.sh /

.github/actions/checkbuild-subdir/checker.sh

@@ -1,9 +1,11 @@
 #!/bin/bash -xe
 
-cd $INPUT_PATH
+set -o pipefail
+
+cd $TARGET_PATH
 
 export CARGO_TARGET_DIR=$GITHUB_WORKSPACE/.buildcache/target
 export CARGO_HOME=$GITHUB_WORKSPACE/.buildcache 
 
 for c in */Cargo.toml
-do (echo checking $c; cd $(dirname $c) && cargo check --verbose); done
+do (echo checking $c; cd $(dirname $c) && cargo check --verbose --message-format=json | /cargo-json-gha-translator) || exit $?; done

.github/actions/checkbuild-subdir/schema.dhall

@@ -0,0 +1,14 @@
+let GithubActions =
+      https://raw.githubusercontent.com/Pctg-x8/gha-schemas/master/schema.dhall
+
+let Params = { path : Text }
+
+let step =
+      λ(params : Params) →
+        GithubActions.Step::{
+        , name = "Building as Checking"
+        , uses = Some "./.github/actions/checkbuild-subdir"
+        , env = Some (toMap { TARGET_PATH = params.path })
+        }
+
+in  { Params, step }

.github/actions/checkbuild-subdir/tester.sh

@@ -1,14 +1,19 @@
 #!/bin/bash -xe
 
-cd $INPUT_PATH
+set -o pipefail
+
+cd $TARGET_PATH
 
 export CARGO_TARGET_DIR=$GITHUB_WORKSPACE/.buildcache/target
 export CARGO_HOME=$GITHUB_WORKSPACE/.buildcache
 
 test_or_check() {
     if `/find-test-code.sh`; then echo "test"; else echo "check"; fi
 }
+run_test() {
+    if $(find . -name ci-test.sh | grep .); then ./ci-test.sh; else cargo `test_or_check` --verbose --message-format=json | /cargo-json-gha-translator; fi
+}
 
 for c in */Cargo.toml; do
-    (cd $(dirname $c) && cargo `test_or_check` --verbose)
+    (cd $(dirname $c) && run_test) || exit $?
 done

.github/actions/codeform-checker/Dockerfile

@@ -1,8 +1,10 @@
-FROM python:3.7
+FROM python:3.13
 
 ADD testutil.py /
 ADD codeform_check.py /
 ADD vulnerabilities_elliminator.py /
+ADD trailing_newline_checker.py /
+ADD linefeed_checker.py /
 ADD executor.sh /
 RUN chmod +x /executor.sh
 

.github/actions/codeform-checker/executor.sh

@@ -1,3 +1,3 @@
 #!/bin/bash -xe
 
-python /$INPUT_SCRIPT.py
+python /$RUN_SCRIPT.py

.github/actions/codeform-checker/linefeed_checker.py

@@ -0,0 +1,21 @@
+from testutil import target_sources, annotate_error
+from io import BufferedIOBase
+from typing import Iterator
+
+def chunked_read(stream: BufferedIOBase, buf_size: int) -> Iterator[bytes]:
+    buf = bytearray(buf_size)
+    while stream.readinto1(buf):
+        yield buf
+
+incorrect_line_feeds = []
+for fpath in target_sources():
+    with open(fpath, "rb") as fp:
+        if any(b'\r' in buf for buf in chunked_read(fp, 64 * 1024)):
+            incorrect_line_feeds.append(fpath)
+
+if not incorrect_line_feeds:
+    print("All files are terminated with LF")
+else:
+    for fpath in incorrect_line_feeds:
+        annotate_error(fpath, 1, 1, f"This file contains CR character")
+    exit(1)

.github/actions/codeform-checker/schema.dhall

@@ -0,0 +1,29 @@
+let GithubActions =
+      https://raw.githubusercontent.com/Pctg-x8/gha-schemas/master/schema.dhall
+
+let Script =
+      < codeform_check
+      | vulnerabilities_elliminator
+      | trailing_newline_checker
+      >
+
+let scriptAsText =
+      let handler =
+            { codeform_check = "codeform_check"
+            , vulnerabilities_elliminator = "vulnerabilities_elliminator"
+            , trailing_newline_checker = "trailing_newline_checker"
+            }
+
+      in  λ(s : Script) → merge handler s
+
+let Params = { script : Script }
+
+let step =
+      λ(params : Params) →
+        GithubActions.Step::{
+        , name = "RunScript"
+        , uses = Some "./.github/actions/codeform-checker"
+        , env = Some (toMap { RUN_SCRIPT = scriptAsText params.script })
+        }
+
+in  { Script, Params, step }

.github/actions/codeform-checker/testutil.py

@@ -2,13 +2,29 @@
 import re
 from typing import Iterable, Tuple
 
-def target_sources():
-    return (p for p in iglob("**/*.rs", recursive=True) if not p.startswith("extras/") and not "target/" in p)
-def file_lines(fp) -> Iterable[Tuple[int, str]]: return enumerate(iter(fp.readline, ""), 1)
+
+def target_sources(first_matcher: str = "**/*.rs"):
+    return (
+        p
+        for p in iglob("**/*.rs", recursive=True)
+        if not p.startswith("extras/") and not "target/" in p
+    )
+
+
+def file_lines(fp) -> Iterable[Tuple[int, str]]:
+    return enumerate(iter(fp.readline, ""), 1)
+
 
 pat_comment_line = re.compile(r"^\s*//")
-def not_comment_line(x: str) -> bool: return not pat_comment_line.match(x)
-def available_lines(fp) -> Iterable[Tuple[int, str]]: return filter(lambda x: not_comment_line(x[1]), file_lines(fp))
+
+
+def not_comment_line(x: str) -> bool:
+    return not pat_comment_line.match(x)
+
+
+def available_lines(fp) -> Iterable[Tuple[int, str]]:
+    return filter(lambda x: not_comment_line(x[1]), file_lines(fp))
+
 
 def annotate_error(file: str, line: int, col: int, msg: str):
     print(f"::error file={file},line={line},col={col}::{msg}")

.github/actions/codeform-checker/trailing_newline_checker.py

@@ -0,0 +1,14 @@
+from testutil import target_sources, annotate_error
+
+has_error = False
+for fpath in target_sources("**/*.{{rs,toml,sh,ps1}}"):
+    with open(fpath, encoding="utf-8") as fp:
+        file_size = fp.seek(0, 2)
+        fp.seek(file_size - 1, 0)
+        if fp.read(1) != "\n":
+            has_error = True
+            fp.seek(0, 0)
+            lines = fp.readlines()
+            annotate_error(fpath, len(lines), 1 + len(lines[-1]), "Source file requires a newline at end of the file")
+
+if has_error: exit(1)

.github/actions/codeform-checker/vulnerabilities_elliminator.py

@@ -11,7 +11,7 @@ def find_unwrap_position_in_line(line: str) -> Optional[int]:
 for fpath in target_sources():
     with open(fpath, encoding="utf-8") as fp:
         unwraps = ((i, find_unwrap_position_in_line(line)) for i, line in available_lines(fp))
-        found_unwrap_vulnerabilities.extend((fpath, i, p.start()) for i, p in unwraps if p is not None)
+        found_unwrap_vulnerabilities.extend((fpath, i, p) for i, p in unwraps if p is not None)
 
 if not found_unwrap_vulnerabilities:
     print("No unwraps found")

.github/actions/create-dev-delivery-prs/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-RUN apk --update add curl git
+RUN apk --update add curl git jq
 ADD runner.sh /
 RUN chmod +x /runner.sh
 

.github/actions/create-dev-delivery-prs/runner.sh

@@ -1,6 +1,8 @@
 #!/bin/sh -e
 
-PR_URL="https://api.github.com/repos/$GITHUB_REPOSITORY/pulls"
+API_URL_REPO_BASE="https://api.github.com/repos/$GITHUB_REPOSITORY"
+PR_URL="$API_URL_REPO_BASE/pulls"
+LABEL_NAME="Changelog Auto Delivery"
 
 HEAD_NAME=$(echo $GITHUB_REF | sed "s/refs\/heads\///")
 TARGETS=$(git branch -a | sed -n "s/\s*remotes\/origin\/\(dev-.\+\)/\1/p")
@@ -9,7 +11,8 @@ for DEST in $TARGETS; do
     if [ $(echo $CHANGELOG_LIST | wc -l) == "0" ]; then
         echo "No diffs between $HEAD_NAME and $DEST. skipping"
     else
-        POST_DATA="{\"title\": \"🚚[CHANGELOG-AUTO-DELIVERY]$HEAD_NAME → $DEST🚚\", \"base\": \"$DEST\", \"head\": \"$HEAD_NAME\"}"
-        curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $INPUT_TOKEN" -d "$POST_DATA" $PR_URL
+        POST_DATA="{\"title\": \"🚚$HEAD_NAME → $DEST🚚\", \"base\": \"$DEST\", \"head\": \"$HEAD_NAME\", \"maintainer_can_modify\": false}"
+        PR_NUMBER=$(curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $GITHUB_TOKEN" -d "$POST_DATA" $PR_URL | jq .number)
+        curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $GITHUB_TOKEN" -d "{ \"labels\": [\"$LABEL_NAME\"] }" "$API_URL_REPO_BASE/issues/$PR_NUMBER/labels"
     fi
 done

.github/actions/create-dev-delivery-prs/schema.dhall

@@ -0,0 +1,17 @@
+let GithubActions =
+      https://raw.githubusercontent.com/Pctg-x8/gha-schemas/master/schema.dhall
+
+let Params =
+      { Type = { token : Text }
+      , default.token = GithubActions.mkExpression "secrets.GITHUB_TOKEN"
+      }
+
+let step =
+      λ(params : Params.Type) →
+        GithubActions.Step::{
+        , name = "Create PullRequest"
+        , uses = Some "./.github/actions/create-dev-delivery-prs"
+        , env = Some (toMap { GITHUB_TOKEN = params.token })
+        }
+
+in  { Params, step }

.github/actions/deployment-dev/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:13
+FROM node:18
 
 # Install tools
 RUN npm install -g firebase-tools

.github/actions/deployment-dev/gen.sh

@@ -3,4 +3,4 @@
 # Copy generated docs for deployment
 rsync --delete -auv $GITHUB_WORKSPACE/target/doc/ /doc/public/dev
 cd /doc
-firebase deploy --token $FIREBASE_TOKEN --project docs-peridot
+firebase deploy --project docs-peridot

.github/actions/deployment-dev/schema.dhall

@@ -0,0 +1,14 @@
+let GithubActions =
+      https://raw.githubusercontent.com/Pctg-x8/gha-schemas/master/schema.dhall
+
+let Params = { FirebaseToken : Text }
+
+let step =
+      λ(params : Params) →
+        GithubActions.Step::{
+        , name = "Deployment to Firebase Hosting (for Dev)"
+        , uses = Some "./.github/actions/deployment-dev"
+        , env = Some (toMap { FIREBASE_TOKEN = params.FirebaseToken })
+        }
+
+in  { Params, step }

.github/workflows/.gitattributes

@@ -0,0 +1 @@
+*.yml linguist-generated=true