Skip to content

Commit

Permalink
fix: update dependencies including deno_core (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsherret authored Jan 5, 2025
1 parent 58c1266 commit 4fffd63
Show file tree
Hide file tree
Showing 19 changed files with 3,075 additions and 3,045 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/ci.generate.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as yaml from "https://deno.land/[email protected]/encoding/yaml.ts";
import $ from "https://deno.land/x/dax@0.35.0/mod.ts";
import * as yaml from "@std/yaml";
import $ from "dax";

enum Runner {
Mac13 = "macos-13",
MacLatest = "macos-latest",
Windows = "windows-latest",
// uses an older version of ubuntu because of issue dprint/#483
// uses an older version of ubuntu because of issue dprint/#483
Linux = "ubuntu-20.04",
}

Expand Down Expand Up @@ -100,11 +100,11 @@ const ci = {
if: `matrix.config.target == 'aarch64-apple-darwin'`,
run: "rustup target add aarch64-apple-darwin",
},
{ uses: "denoland/setup-deno@v1" },
{ uses: "denoland/setup-deno@v2" },
{
uses: "actions/setup-node@v4",
with: {
"node-version": 18,
"node-version": 21,
},
},
{
Expand All @@ -115,8 +115,8 @@ const ci = {
name: "Setup cross",
if: "matrix.config.cross == 'true'",
run: [
"deno task build",
"cargo install cross --git https://github.com/cross-rs/cross --rev 44011c8854cb2eaac83b173cc323220ccdff18ea",
"cd js/node && npm run build:script",
"cargo install cross --locked --git https://github.com/cross-rs/cross --rev 44011c8854cb2eaac83b173cc323220ccdff18ea",
].join("\n"),
},
{
Expand Down Expand Up @@ -209,9 +209,9 @@ const ci = {
needs: "build",
"runs-on": "ubuntu-latest",
steps: [
{ name: "Checkout", uses: "actions/checkout@v2" },
{ name: "Checkout", uses: "actions/checkout@v4" },
{ name: "Download artifacts", uses: "actions/download-artifact@v4" },
{ uses: "denoland/setup-deno@v1" },
{ uses: "denoland/setup-deno@v2" },
{
name: "Move downloaded artifacts to root directory",
run: profiles.map((profile) => {
Expand Down Expand Up @@ -246,7 +246,7 @@ const ci = {
// },
{
name: "Release",
uses: "softprops/action-gh-release@v1",
uses: "softprops/action-gh-release@v2",
env: { GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" },
with: {
files: [
Expand Down Expand Up @@ -297,9 +297,8 @@ In a dprint configuration file:

let finalText = `# GENERATED BY ./ci.generate.ts -- DO NOT DIRECTLY EDIT\n\n`;
finalText += yaml.stringify(ci, {
noRefs: true,
lineWidth: 10_000,
noCompatMode: true,
compatMode: false,
});

Deno.writeTextFileSync(new URL("./ci.yml", import.meta.url), finalText);
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ jobs:
- name: Setup Rust (aarch64-apple-darwin)
if: matrix.config.target == 'aarch64-apple-darwin'
run: rustup target add aarch64-apple-darwin
- uses: denoland/setup-deno@v1
- uses: denoland/setup-deno@v2
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 21
- name: npm install
run: cd js/node && npm ci
- name: Setup cross
if: matrix.config.cross == 'true'
run: |-
deno task build
cargo install cross --git https://github.com/cross-rs/cross --rev 44011c8854cb2eaac83b173cc323220ccdff18ea
cd js/node && npm run build:script
cargo install cross --locked --git https://github.com/cross-rs/cross --rev 44011c8854cb2eaac83b173cc323220ccdff18ea
- name: Build (Debug)
if: "matrix.config.cross != 'true' && !startsWith(github.ref, 'refs/tags/')"
run: "cargo build --locked --all-targets --target ${{matrix.config.target}}"
Expand Down Expand Up @@ -163,10 +163,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v4
- uses: denoland/setup-deno@v1
- uses: denoland/setup-deno@v2
- name: Move downloaded artifacts to root directory
run: |-
mv x86_64-apple-darwin-artifacts/dprint-plugin-prettier-x86_64-apple-darwin.zip .
Expand All @@ -190,7 +190,7 @@ jobs:
id: get_plugin_file_checksum
run: 'echo "CHECKSUM=$(shasum -a 256 plugin.json | awk ''{print $1}'')" >> $GITHUB_OUTPUT'
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
Expand Down
Loading

0 comments on commit 4fffd63

Please sign in to comment.