Skip to content

Commit

Permalink
Merge branch 'v1/main' into fix-pantry-not-found
Browse files Browse the repository at this point in the history
  • Loading branch information
felipecrs authored Jan 16, 2025
2 parents 395f28b + 7f1b557 commit a808100
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
# - uses: pkgxdev/dev@v0
- uses: denoland/setup-deno@v2
with:
deno-version: ^2.0.2
deno-version: ^2.1.4

- run: deno task compile

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.shellcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- uses: denoland/setup-deno@v2
with:
deno-version: ^2.0.2
deno-version: ^2.1.4
- uses: actions/checkout@v4
- run: deno task compile
- uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v4
- uses: denoland/setup-deno@v2 # using ourself to install deno could compromise the tests
with:
deno-version: ^2.0.2
deno-version: ^2.1.4
- run: deno cache **/*.test.ts
- run: deno task test --coverage=cov_profile --no-check
- run: deno coverage cov_profile --lcov --exclude=tests/ --output=cov_profile.lcov
Expand All @@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v4
- uses: denoland/setup-deno@v2 # using ourself to install deno could compromise the tests
with:
deno-version: ^2.0.2
deno-version: ^2.1.4
- run: deno lint

typecheck:
Expand All @@ -68,5 +68,5 @@ jobs:
- uses: actions/checkout@v4
- uses: denoland/setup-deno@v2
with:
deno-version: ^2.0.2
deno-version: ^2.1.4
- run: deno task typecheck
2 changes: 1 addition & 1 deletion deno.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typecheck": "deno check ./entrypoint.ts",
"compile": "deno compile --lock=deno.lock --allow-all --output \"$INIT_CWD/pkgx\" ./entrypoint.ts"
},
"pkgx": "deno~2.0",
"pkgx": "deno~2.1.4",
"lint": {
"exclude": ["src/**/*.test.ts"]
},
Expand Down
11 changes: 6 additions & 5 deletions scripts/publish-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ if ! git diff-index --quiet HEAD --; then
exit 1
fi

if [ "$(git rev-parse --abbrev-ref HEAD)" != main ]; then
if [ "$(git rev-parse --abbrev-ref HEAD)" != v1/main ]; then
echo "error: requires main branch" >&2
exit 1
fi

# ensure we have the latest version tags
git fetch origin -pft

versions="$(git tag | grep '^v[0-9]\+\.[0-9]\+\.[0-9]\+')"
versions="$(git tag | grep '^v1\.[0-9]\+\.[0-9]\+')"
v_latest="$(npx -- semver --include-prerelease $versions | tail -n1)"

_is_prerelease() {
Expand Down Expand Up @@ -45,7 +45,7 @@ fi

gum confirm "prepare draft release for $v_new?" || exit 1

git push origin main
git push origin v1/main

is_prerelease=$(_is_prerelease $v_new)

Expand All @@ -55,14 +55,15 @@ gh release create \
--prerelease=$is_prerelease \
--generate-notes \
--notes-start-tag=v$v_latest \
--latest=false \
--title=v$v_new

gh workflow run cd.yml --raw-field version="$v_new"
gh workflow run cd.yml --ref=v1/main --raw-field version="$v_new"
# ^^ infuriatingly does not tell us the ID of the run

gum spin --title 'sleeping 5s because GitHub API is slow' -- sleep 5

run_id=$(gh run list --json databaseId --workflow=cd.yml | jq '.[0].databaseId')
run_id=$(gh run list --json databaseId --branch=v1/main --workflow=cd.yml | jq '.[0].databaseId')

if ! gh run watch --exit-status $run_id; then
foo=$?
Expand Down
2 changes: 1 addition & 1 deletion src/modes/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default async function(pkgs: PackageRequirement[], unsafe: boolean) {
# shellcheck source=$ENV_FILE
. "$ENV_FILE"
set +a
exec "$PKGX_DIR/${pkgstr}/v*/bin/${program}" "$ARGS"
exec "$PKGX_DIR/${pkgstr}/v*/bin/${program}" $ARGS
else
pkgx_resolve
fi
Expand Down
3 changes: 3 additions & 0 deletions src/utils/devenv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ export default async function(dir: Path) {
case "Justfile":
pkgs.push({ project: 'just.systems', constraint })
break
case "Taskfile.yml":
pkgs.push({ project: 'taskfile.dev', constraint })
break
}
} else if (isDirectory) {
switch (name) {
Expand Down

0 comments on commit a808100

Please sign in to comment.