Skip to content

Commit

Permalink
universal
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Dec 7, 2023
1 parent 14fcb55 commit ffc9f6b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 20 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rtx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ignored:
- DL3008
- DL3018
- DL3028
- DL3041
- DL3008
- DL3018
- DL3028
- DL3041
7 changes: 6 additions & 1 deletion .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/)'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ffc9f6b

Please sign in to comment.