Skip to content

Commit feef87b

Browse files
committed
Merge branch 'main' into output-design
2 parents a1dca62 + 92ec119 commit feef87b

12 files changed

Lines changed: 76 additions & 81 deletions

File tree

.circleci/config.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@ jobs:
99
- checkout
1010
- gh/install
1111

12-
# Install asdf and the tools specified in .tool-versions
13-
- run: git clone https://github.com/brandoncc/circleci-asdf-installer.git ~/circleci-asdf-installer
14-
- run: ~/circleci-asdf-installer/bin/clone-asdf
15-
- restore_cache:
16-
keys:
17-
- tools-cache-{{ checksum ".tool-versions" }}
18-
- run: ~/circleci-asdf-installer/bin/install-asdf-plugins-and-versions
19-
- save_cache:
20-
key: tools-cache-{{ checksum ".tool-versions" }}
21-
paths:
22-
- "~/.asdf/plugins"
23-
- "~/.asdf/installs"
12+
- run:
13+
name: Install langs/tools
14+
command: |
15+
curl https://mise.run | sh
16+
echo 'export PATH="$HOME/.local/bin:$PATH"' >> "$BASH_ENV"
17+
echo 'eval "$(/home/circleci/.local/bin/mise activate bash)"' >> "$BASH_ENV"
18+
source "$BASH_ENV"
19+
mise install
2420
2521
# Install a specific version of the tool (recommended for teams)
2622
# - run: curl -fsSL https://github.com/levibostian/decaf/blob/HEAD/install?raw=true | bash "1.0.0"

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1212

1313
- name: Set up Deno
14-
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 # v4
14+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
1515

1616
- name: Run formatter and fail if not formatted
1717
run: |
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2828

2929
- name: Set up Deno
30-
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 # v4
30+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
3131

3232
- name: Run lint and fail if there are errors
3333
run: |

.github/workflows/lockfile-update.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main] # PRs that target the main branch
66
paths: # only run if these files are changed
77
- 'deno.jsonc'
8+
- 'steps/deno.jsonc'
89

910
jobs:
1011
update-lockfile:
@@ -29,27 +30,31 @@ jobs:
2930
token: ${{ steps.generate-token.outputs.token }}
3031

3132
- name: Setup Deno
32-
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 # v4
33+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
3334

3435
- name: Update Deno lock file
3536
run: deno install --frozen=false
3637

38+
- name: Update Deno lock file in steps/
39+
run: deno install --frozen=false
40+
working-directory: steps
41+
3742
- name: Check if lock file changed
3843
id: check-changes
3944
run: |
40-
if git diff --quiet deno.lock; then
45+
if git diff --quiet deno.lock steps/deno.lock; then
4146
echo "changed=false" >> $GITHUB_OUTPUT
42-
echo "No changes to deno.lock file"
47+
echo "No changes to lock files"
4348
else
4449
echo "changed=true" >> $GITHUB_OUTPUT
45-
echo "deno.lock file has been updated"
50+
echo "Lock file(s) have been updated"
4651
fi
4752
4853
- name: Commit and push changes
4954
if: steps.check-changes.outputs.changed == 'true'
5055
run: |
5156
git config --local user.email "action@github.com"
5257
git config --local user.name "GitHub Action"
53-
git add deno.lock
54-
git commit -m "chore: update deno.lock file"
58+
git add deno.lock steps/deno.lock
59+
git commit -m "chore: update deno.lock files"
5560
git push

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1212

1313
- name: Set up Deno
14-
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 # v4
14+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
1515

1616
- name: Install dependencies
1717
run: deno install --frozen
@@ -20,7 +20,7 @@ jobs:
2020
run: deno task test
2121

2222
- name: Upload test results
23-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
23+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
2424
with:
2525
name: junit-results
2626
path: reports/junit.xml

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deno 2.6.9
1+
deno 2.7.4

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ runs:
7070

7171
- name: Set up Deno
7272
if: ${{ inputs.compile_binary == 'true' }}
73-
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 # v4
73+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
7474

7575
# compile binary and put into a location in PATH. the path matches what's in the ./install script.
7676
- name: Compile binary

deno.jsonc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"imports": {
33
"@david/service-store": "jsr:@david/service-store@^0.3.0",
4-
"@david/dax": "jsr:@david/dax@^0.44.0",
5-
"@levibostian/sh-style": "jsr:@levibostian/sh-style@0.7.0",
4+
"@david/dax": "jsr:@david/dax@^0.45.0",
5+
"@levibostian/cathy": "jsr:@levibostian/cathy@^2.0.1",
6+
"@levibostian/sh-style": "jsr:@levibostian/sh-style@^0.7.0",
67
"@std/cli": "jsr:@std/cli@^1.0.20",
78
"@std/path": "jsr:@std/path@^1.1.4",
89
"@std/semver": "jsr:@std/semver@^1.0.4",
@@ -24,6 +25,7 @@
2425
"test": "deno task test-deploy-scripts && deno task run-tests && deno task run-coverage",
2526
"test-update": "deno task test -- --update",
2627
"compile": "deno compile --output $OUTPUT_FILE_NAME --allow-env --allow-net=api.github.com --allow-run --allow-read --allow-write=/tmp,/var/folders,/home/runner/work/_temp --target $DENO_TARGET index.ts",
28+
"compile-all": "OUTPUT_FILE_NAME=dist/bin-x86_64-Linux DENO_TARGET=x86_64-unknown-linux-gnu deno task compile && OUTPUT_FILE_NAME=dist/bin-aarch64-Linux DENO_TARGET=aarch64-unknown-linux-gnu deno task compile && OUTPUT_FILE_NAME=dist/bin-x86_64-Darwin DENO_TARGET=x86_64-apple-darwin deno task compile && OUTPUT_FILE_NAME=dist/bin-aarch64-Darwin DENO_TARGET=aarch64-apple-darwin deno task compile",
2729
"format": "deno fmt",
2830
"lint": "deno fmt && deno lint --fix"
2931
},

deno.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/github-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as cathy from "cathy"
21
import * as di from "./di.ts"
2+
import * as cathy from "@levibostian/cathy"
33

44
export interface GitHubRelease {
55
tag: {

renovate.json5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
":automergeDigest",
66
"github>Omochice/renovate-config:deno"
77
],
8+
"automerge": true,
89
"timezone": "America/Chicago",
910
"schedule": ["every weekend"],
1011
"packageRules": [
1112
{
1213
"groupName": "GitHub Actions",
1314
"matchManagers": ["github-actions"],
14-
"matchUpdateTypes": ["minor", "patch"],
15-
"automerge": true
15+
"matchUpdateTypes": ["minor", "patch"]
1616
}
1717
]
1818
}

0 commit comments

Comments
 (0)