Skip to content

Commit

Permalink
Adjusted build script to support the latest version of Deno
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Weichert committed Sep 20, 2023
1 parent 9655ec4 commit 539e7b0
Show file tree
Hide file tree
Showing 25 changed files with 95 additions and 95 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts
cache: "npm"

- uses: denoland/setup-deno@v1
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts
cache: "npm"

- uses: denoland/setup-deno@v1
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts
cache: "npm"

- name: Debug matrix variables
Expand Down Expand Up @@ -461,7 +461,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts

- name: Download work archive
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -510,7 +510,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts

- name: Download work archive
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -539,7 +539,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: lts/gallium
node-version: lts

- uses: denoland/setup-deno@v1

Expand Down
6 changes: 3 additions & 3 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ if [ "$0" == "./bin/build.sh" -a -f index.ts ]; then
MAJOR_VERSION=$(echo $VERSION | cut -d. -f1)
MINOR_VERSION=$(echo $VERSION | cut -d. -f2)

if [ "$MAJOR_VERSION" -lt "1" ] || [ "$MAJOR_VERSION" -eq "1" -a "$MINOR_VERSION" -lt "34" ]; then
echo "❌ Deno is installed, but the version is less than v1.34. Please use Deno v1.34 or greater."
if [ "$MAJOR_VERSION" -lt "1" ] || [ "$MAJOR_VERSION" -eq "1" -a "$MINOR_VERSION" -lt "36" ]; then
echo "❌ Deno is installed, but the version is less than v1.34. Please use Deno v1.36 or greater."
exit 1
fi
if [ -z "$DENO_TARGET" ]; then
TARGET_ARG=""
else
TARGET_ARG="--target $DENO_TARGET"
fi
deno compile -o taq --unstable --allow-run --allow-write --allow-read --allow-env --allow-net --import-map ./import_map.json --no-prompt index.ts $TARGET_ARG -- --setBuild "$BUILD" --setVersion "$TAQ_VERSION"
deno compile -o taq --unstable --allow-run --allow-write --allow-read --allow-env --allow-net --import-map ./import_map.json --no-prompt index.ts $TARGET_ARG --setBuild "$BUILD" --setVersion "$TAQ_VERSION"
fi
else
echo "Usage: ./bin/build.sh"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "0.39.28",
"version": "0.39.29",
"packages": [
"taqueria-protocol",
"taqueria-plugin*",
Expand Down
86 changes: 43 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@taqueria/root",
"version": "0.39.28",
"version": "0.39.29",
"description": "An easy to use opinionated tool for building, testing, and deploying Tezos software",
"main": "index.ts",
"directories": {
Expand Down
4 changes: 2 additions & 2 deletions taqueria-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@taqueria/analytics",
"version": "0.39.28",
"version": "0.39.29",
"description": "A TypeScript SDK submitting events for Taqueria activity",
"main": "./index.js",
"source": "./index.ts",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://github.com/pinnacle-labs/taqueria#readme",
"dependencies": {
"@taqueria/protocol": "^0.39.28",
"@taqueria/protocol": "^0.39.29",
"node-machine-id-xz": "^1.0.2"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions taqueria-plugin-archetype/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@taqueria/plugin-archetype",
"version": "0.39.28",
"version": "0.39.29",
"description": "A taqueria plugin for compiling Archetype smart contracts",
"targets": {
"default": {
Expand Down Expand Up @@ -40,7 +40,7 @@
},
"homepage": "https://github.com/pinnacle-labs/taqueria#readme",
"dependencies": {
"@taqueria/node-sdk": "^0.39.28",
"@taqueria/node-sdk": "^0.39.29",
"fast-glob": "^3.3.1",
"ts-pattern": "^5.0.5"
},
Expand Down
Loading

0 comments on commit 539e7b0

Please sign in to comment.