From ffc9f6ba1f1e47cf5e2783a64cb16f07a77d04a4 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Wed, 6 Dec 2023 18:51:24 -0600
Subject: [PATCH] universal

---
 .github/workflows/release.yml | 14 ++++++--------
 .github/workflows/rtx.yml     | 10 +++++-----
 .hadolint.yaml                |  8 ++++----
 .mega-linter.yml              |  7 ++++++-
 README.md                     |  2 +-
 justfile                      |  2 +-
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2a083eb87a..18cd90f678 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,20 +63,18 @@ jobs:
             name: macos-arm64
             target: aarch64-apple-darwin
             runs-on: macos-12
-          - os: macos
-            name: macos
-            target: universal2-apple-darwin
-            runs-on: macos-12
+#          - os: macos
+#            name: macos
+#            target: universal2-apple-darwin
+#            runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
-      - run: |
+      - if: matrix.target == 'universal2-apple-darwin'
+        run: |
           brew install zig
           rustup target add x86_64-apple-darwin
           rustup target add aarch64-apple-darwin
           cargo install cargo-zigbuild
-        if: matrix.target == 'universal2-apple-darwin'
-#      - run: sudo apt-get update; sudo apt-get install musl-tools
-#        if: matrix.runs-on == 'buildjet-4vcpu-ubuntu-2204-arm'
       - run: rustup target add ${{matrix.target}}
         if: matrix.target != 'universal2-apple-darwin'
       - run: rustup toolchain install stable --profile minimal
diff --git a/.github/workflows/rtx.yml b/.github/workflows/rtx.yml
index a32796b939..c81223be76 100644
--- a/.github/workflows/rtx.yml
+++ b/.github/workflows/rtx.yml
@@ -25,8 +25,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: test
-          save-if: false
+          shared-key: unit
+          save-if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
           cache-provider: buildjet
       # - uses: taiki-e/install-action@v2
       #   with:
@@ -53,8 +53,8 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: test
-          save-if: false
+          shared-key: unit
+          save-if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
           cache-provider: buildjet
       - run: sudo apt-get update; sudo apt-get install shfmt shellcheck
       - uses: taiki-e/install-action@just
@@ -80,7 +80,7 @@ jobs:
       - run: rustup toolchain install nightly --component llvm-tools-preview
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: test
+          shared-key: coverage
           cache-provider: buildjet
           save-if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
           cache-all-crates: true
diff --git a/.hadolint.yaml b/.hadolint.yaml
index 76bcd77970..0303e48ae7 100644
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,5 +1,5 @@
 ignored:
-    - DL3008
-    - DL3018
-    - DL3028
-    - DL3041
+  - DL3008
+  - DL3018
+  - DL3028
+  - DL3041
diff --git a/.mega-linter.yml b/.mega-linter.yml
index 7eda535bdd..afa427ebbb 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -15,7 +15,12 @@ DISABLE:
   - SPELL
 
 DISABLE_LINTERS:
+  - COPYPASTE_JSCPD
+  - REPOSITORY_GRYPE
   - REPOSITORY_CHECKOV
+  - REPOSITORY_DEVSKIM
+  - REPOSITORY_KICS
+  - REPOSITORY_TRIVY
 
 PRE_COMMANDS:
   - command: apk add --no-cache zlib-dev zlib-static openssl-dev libffi-dev
@@ -25,4 +30,4 @@ SHOW_ELAPSED_TIME: true
 #FILEIO_REPORTER: false
 
 FILTER_REGEX_EXCLUDE: "(completions/|target/)"
-JSON_JSONLINT_FILTER_REGEX_EXCLUDE: '(\.vscode/)'
+JSON_JSONLINT_FILTER_REGEX_EXCLUDE: '(\.devcontainer/)'
diff --git a/README.md b/README.md
index 4bf30e980a..1fd74f5e47 100644
--- a/README.md
+++ b/README.md
@@ -674,7 +674,7 @@ They support aliases, which means you can have an `.nvmrc` file with `lts/hydrog
 in rtx and nvm. Here are some of the supported legacy version files:
 
 | Plugin    | "Legacy" (Idiomatic) Files                         |
-| --------- | -------------------------------------------------- |
+|-----------|----------------------------------------------------|
 | crystal   | `.crystal-version`                                 |
 | elixir    | `.exenv-version`                                   |
 | go        | `.go-version`, `go.mod`                            |
diff --git a/justfile b/justfile
index 686d088d7f..41ce7a64e5 100644
--- a/justfile
+++ b/justfile
@@ -62,7 +62,7 @@ test-coverage:
     ./e2e/run_all_tests
     if [[ "${TEST_TRANCHE:-}" == 0 ]]; then
         rtx trust
-        just pre-commit
+        pre-commit: render-help render-completions render-mangen
         rtx implode
     elif [[ "${TEST_TRANCHE:-}" == 1 ]]; then
         rtx trust