main

.github/scripts/copy_to_versioned.sh

@@ -4,11 +4,11 @@ echo "Open PR to versioned branch (or not, if it was already there)"
 echo ""
 echo "Skipping failure here too, becuase we don't actually care"
 echo "if the PR is already there."
-gh pr create -f --head --main --base versioned || true
+gh pr create -f --head main --base versioned || true
 
 echo "This ensures we have our commits pushed. We could be up to date"
 echo "already. But it doesn't really matter."
 git push || true
 
 echo "Setting PR to merge automatically..."
-gh pr merge versioned --auto
+gh pr merge --auto --merge

.github/workflows/ci.yml

@@ -20,8 +20,18 @@ jobs:
       pull-requests: write
       contents: write
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+    - name: Fetch Dependabot metadata
+      id: dependabot-metadata
+      uses: dependabot/fetch-metadata@v1.3.1
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
     - name: 'Merge (if dependabot)'
-      run: gh pr merge versioned --auto
+      run: gh pr merge "$PR_URL" --auto --merge
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PR_URL: ${{ github.event.pull_request.html_url }}
 
 
   Test:
@@ -41,7 +51,7 @@ jobs:
         with:
           node-version: '16'
       - name: Restore bazel cache
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         env:
           cache-name: bazel-cache
         with:
@@ -68,7 +78,7 @@ jobs:
         with:
           node-version: '16'
       - name: Restore bazel cache
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         env:
           cache-name: bazel-cache
         with:
@@ -91,7 +101,7 @@ jobs:
         with:
           node-version: '16'
       - name: Restore bazel cache
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         env:
           cache-name: bazel-cache
         with:
@@ -121,4 +131,9 @@ jobs:
           fetch-depth: 0
       - run: ./.github/scripts/copy_to_versioned.sh
         shell: bash
-
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+
+
+

BUILD.bazel

@@ -47,10 +47,12 @@ js_library(
 exports_files(
     [
         ".prettierrc.json",
+        "package.json",
         ".gitignore",
         ".editorconfig",
         ".eslintrc.json",
         "css_loader.d.ts",
+        "yarn.lock",
     ],
     visibility = ["//visibility:public"],
 )

bzl/deps.bzl

@@ -5,6 +5,7 @@
 # Install the nodejs "bootstrap" package
 # This provides the basic tools for running and packaging nodejs programs in Bazel
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 def fetch_dependencies():
     http_archive(
@@ -145,3 +146,9 @@ exports_files(glob(["**/*"], exclude_directories=0))
         """,
         # exports_files(glob(["**/*"]), visibility=["//visibility:public"])
     )
+
+    git_repository(
+        name = "bazel_tools",
+        branch = "master",
+        remote = "git@github.com:attilaolah/bazel-tools.git",
+    )

bzl/hash/BUILD

@@ -1 +1 @@
-# no output defined here
+# no output defined here

bzl/hash/rules.bzl

@@ -3,26 +3,26 @@ def _impl(ctx):
     # Actions are run only when the corresponding file is requested.
 
     inputs = ctx.files.srcs
-    arguments = [ file.path for file in ctx.files.srcs ]
+    arguments = [file.path for file in ctx.files.srcs]
 
     ctx.actions.run_shell(
         outputs = [ctx.outputs.md5],
         inputs = inputs,
-        command = "md5sum $@ > {}".format( ctx.outputs.md5.path),
+        command = "md5sum $@ > {}".format(ctx.outputs.md5.path),
         arguments = arguments,
     )
 
     ctx.actions.run_shell(
         outputs = [ctx.outputs.sha1],
         inputs = inputs,
-        command = "sha1sum $@ > {}".format( ctx.outputs.sha1.path),
+        command = "sha1sum $@ > {}".format(ctx.outputs.sha1.path),
         arguments = arguments,
     )
 
     ctx.actions.run_shell(
         outputs = [ctx.outputs.sha256],
         inputs = inputs,
-        command = "sha256sum $@ > {}".format( ctx.outputs.sha256.path),
+        command = "sha256sum $@ > {}".format(ctx.outputs.sha256.path),
         arguments = arguments,
     )
 
@@ -47,4 +47,4 @@ def hashes(**kwargs):
         sha1 = "%s.sha1" % name,
         sha256 = "%s.sha256" % name,
         **kwargs
-    )
+    )

bzl/hash/test/BUILD

@@ -3,11 +3,14 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
 
 hashes(
     name = "hashes",
-    srcs = [ "input1.txt", "input2.txt" ]
+    srcs = [
+        "input1.txt",
+        "input2.txt",
+    ],
 )
 
 generated_file_test(
     name = "version_concat_test",
+    src = "expected.txt",
     generated = ":hashes",
-    src = "expected.txt"
-)
+)

bzl/versioning/BUILD

@@ -1,7 +1,6 @@
 exports_files(
     [
-        "bump.py"
+        "bump.py",
     ],
     visibility = ["//visibility:public"],
 )
-

bzl/versioning/rules.bzl

@@ -11,75 +11,73 @@ def semver_version(name, **kwargs):
 
 def _semver_version_impl(ctx):
     ctx.actions.run_shell(
-        outputs = [ ctx.outputs.output ],
+        outputs = [ctx.outputs.output],
         inputs = [
             ctx.file.major,
             ctx.file.minor,
-            ctx.file.patch
+            ctx.file.patch,
         ],
-        arguments = [ file.path for file in [
+        arguments = [file.path for file in [
             ctx.outputs.output,
             ctx.file.major,
             ctx.file.minor,
-            ctx.file.patch
-        ] ],
+            ctx.file.patch,
+        ]],
         command = "cat <(echo v) $2 <(echo .) $3 <(echo .) $4 | tr -d '\n' > $1",
-        progress_message = "Concatenating version number..."
+        progress_message = "Concatenating version number...",
     )
 
-
 _semver_version = rule(
     implementation = _semver_version_impl,
     attrs = {
         "major": attr.label(allow_single_file = True, mandatory = True),
         "minor": attr.label(allow_single_file = True, mandatory = True),
         "patch": attr.label(allow_single_file = True, mandatory = True),
-        "output": attr.output(mandatory = True)
-    }
+        "output": attr.output(mandatory = True),
+    },
 )
 
 def _absolute_label(label):
-    if label.startswith('@') or label.startswith('/'):
+    if label.startswith("@") or label.startswith("/"):
         return label
-    if label.startswith(':'):
-        return native.repository_name() + '//' + native.package_name() + label
-    return native.repository_name() + '//' + native.package_name() + ':' + label
+    if label.startswith(":"):
+        return native.repository_name() + "//" + native.package_name() + label
+    return native.repository_name() + "//" + native.package_name() + ":" + label
 
 def bump_on_change_test(name, srcs = [], version_lock = None, version = None, run_on_main = False):
     tags = []
 
     if not run_on_main:
-        tags = [ 'do_not_run_on_main' ]
+        tags = ["do_not_run_on_main"]
 
     hashes_name = name + "_version_lock_validator"
     hashes(
         name = hashes_name,
-        srcs = srcs + [ version ],
+        srcs = srcs + [version],
     )
 
     generated_file_test(
         name = name,
         generated = hashes_name,
         src = version_lock,
-        tags = tags + [ 'version_check' ]
+        tags = tags + ["version_check"],
     )
 
     py_binary(
         name = name + ".bump",
-        srcs = [ "//bzl/versioning:bump.py" ],
+        srcs = ["//bzl/versioning:bump.py"],
         main = "//bzl/versioning:bump.py",
-        data = [ version, hashes_name, version_lock ],
+        data = [version, hashes_name, version_lock],
         args = [
-            "--to_bump_in", "$(rootpath " + version + ")",
-            "--to_bump_out", "$(rootpath " + version + ")",
-            "--lockfile_build_label",  _absolute_label(hashes_name),
-            "--lockfile_build_rootpath", "$(rootpath " + hashes_name + ")",
-            "--lockfile_out_rootpath", "$(rootpath " + version_lock + ")"
-        ]
+            "--to_bump_in",
+            "$(rootpath " + version + ")",
+            "--to_bump_out",
+            "$(rootpath " + version + ")",
+            "--lockfile_build_label",
+            _absolute_label(hashes_name),
+            "--lockfile_build_rootpath",
+            "$(rootpath " + hashes_name + ")",
+            "--lockfile_out_rootpath",
+            "$(rootpath " + version_lock + ")",
+        ],
     )
-
-
-
-
-
-

bzl/versioning/test/bump_on_change_test/BUILD

@@ -2,8 +2,8 @@ load("//bzl/versioning:rules.bzl", "bump_on_change_test")
 
 bump_on_change_test(
     name = "version",
-    srcs = [ "contents.txt" ],
-    version_lock = "version.lock",
+    srcs = ["contents.txt"],
+    run_on_main = True,
     version = "MAJOR",
-    run_on_main = True
-)
+    version_lock = "version.lock",
+)

bzl/versioning/test/semver_version/BUILD

@@ -5,11 +5,11 @@ semver_version(
     name = "version",
     major = "MAJOR",
     minor = "MINOR",
-    patch = "PATCH"
+    patch = "PATCH",
 )
 
 generated_file_test(
     name = "version_concat_test",
+    src = "expected.txt",
     generated = ":version",
-    src = "expected.txt"
-)
+)

deploy/BUILD

@@ -1,13 +1,40 @@
+load("//:rules.bzl", "nodejs_binary", "ts_project")
+
+package(default_visibility = ["//deploy:__subpackages__"])
+
+# This is a list of build tags which will be uploaded to a github release.
+BUILD_ARTIFACTS = {
+    "recursive_vassals.zip": "//project/ck3/recursive-vassals:mod_zip",
+    "recursive_vassals.patch": "//project/ck3/recursive-vassals:patch",
+}
+
+ts_project(
+    name = "release_src",
+    srcs = ["release.ts"],
+    deps = [
+        "@npm//@actions/github",
+        "@npm//@types/node",
+        "@npm//mime",
+    ],
+)
+
+nodejs_binary(
+    name = "release",
+    data = BUILD_ARTIFACTS.values(),
+    entry_point = "release.js",
+    templated_args = [name + "=" + "$(rootpaths " + tag + ")" for (name, tag) in BUILD_ARTIFACTS.items()],
+)
+
 sh_binary(
     name = "deploy",
     srcs = ["deploy.sh"],
     data = [
-        "//deploy/artifacts:release",
+        "//deploy:release",
         "//project/cultist/multiplayer/deploy:pulumi_prod",
     ],
     env = {
         "PULUMI_CULTIST_MULTIPLAYER": "$(location //project/cultist/multiplayer/deploy:pulumi_prod)",
-        "ARTIFACT_RELEASE": "$(location //deploy/artifacts:release)",
+        "RELEASE": "$(location //deploy:release)",
     },
     deps = ["@bazel_tools//tools/bash/runfiles"],
 )

js/api-extractor/BUILD

@@ -0,0 +1 @@
+# spooky in here