Skip to content

Commit

Permalink
Fix workflow issue
Browse files Browse the repository at this point in the history
  • Loading branch information
spaaaacccee committed Dec 6, 2024
1 parent b852660 commit 1dd44df
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install and Build
run: |
bun i
cd client && bun run build && npm run package
cd client && bun run build && bun run package
- name: Build adapter (Filesystem Sync)
run: |
cd adapter-fs-bridge && bun i && bun run build && zip -r dist.zip dist
Expand Down
6 changes: 3 additions & 3 deletions adapter-fs-bridge/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rm -rf dist

# Build

npx --yes [email protected] build
bunx --yes [email protected] build

# Copy files

Expand All @@ -15,7 +15,7 @@ cp -r adapter.config.yaml dist

# Make executables

npx --yes pkg \
bunx --yes pkg \
--out-path dist \
--compress GZip \
--target node18-windows,node18-linux \
Expand All @@ -28,7 +28,7 @@ rm dist/main-linux~

# Add metadata to Windows executable

npx --yes resedit-cli \
bunx --yes resedit-cli \
--in dist/main-win.exe \
--out dist/main-win.exe \
--icon "1,icon.ico" \
Expand Down
5 changes: 3 additions & 2 deletions adapter-fs-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"pkg": "^5.8.1",
"vite": "^5.4.11",
"vite-node": "^0.34.4",
"vite-tsconfig-paths": "^4.2.1"
}
"vite-tsconfig-paths": "^5.1.3"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions adapter-iron-harvest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ USER root
WORKDIR /usr/src/app/

COPY package.json .
RUN npm i
RUN bun i

COPY . .

ENV PORT=80
EXPOSE 80

CMD ["node", "-r", "ts-node/register/transpile-only", "src/index.ts" ]
CMD ["node", "-r", "ts-node/register/transpile-only", "src/index.ts" ]
6 changes: 3 additions & 3 deletions adapter-iron-harvest/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rm -rf dist

# Build

npx --yes [email protected] build
bunx --yes [email protected] build

# Copy files

Expand All @@ -15,7 +15,7 @@ cp -r adapter.config.yaml dist

# Make executables

npx --yes pkg \
bunx --yes pkg \
--out-path dist \
--compress GZip \
--target node18-windows,node18-linux \
Expand All @@ -28,7 +28,7 @@ rm dist/main-linux~

# Add metadata to Windows executable

npx --yes resedit-cli \
bunx --yes resedit-cli \
--in dist/main-win.exe \
--out dist/main-win.exe \
--icon "1,icon.ico" \
Expand Down
3 changes: 2 additions & 1 deletion adapter-iron-harvest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
"vite-node": "^0.33.0",
"vite-tsconfig-paths": "^5.1.3",
"vitest": "^0.29.8"
}
},
"type": "module"
}
5 changes: 3 additions & 2 deletions adapter-warthog-wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@types/md5": "^2.3.1",
"gh-pages": "^6.0.0",
"vite": "^5.4.11",
"vite-tsconfig-paths": "^4.2.1"
}
"vite-tsconfig-paths": "^5.1.3"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions adapter-warthog-websocket/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ USER root
WORKDIR /usr/src/app/

COPY package.json .
RUN npm i
RUN bun i

COPY . .

ENV PORT=80
EXPOSE 80

CMD ["node", "-r", "ts-node/register/transpile-only", "src/index.ts" ]
CMD ["node", "-r", "ts-node/register/transpile-only", "src/index.ts" ]
6 changes: 3 additions & 3 deletions adapter-warthog-websocket/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rm -rf dist

# Build

npx --yes [email protected] build
bunx --yes [email protected] build

# Copy files

Expand All @@ -15,7 +15,7 @@ cp -r adapter.config.yaml dist

# Make executables

npx --yes pkg \
bunx --yes pkg \
--out-path dist \
--compress GZip \
--target node18-windows,node18-linux \
Expand All @@ -28,7 +28,7 @@ rm dist/main-linux~

# Add metadata to Windows executable

npx --yes resedit-cli \
bunx --yes resedit-cli \
--in dist/main-win.exe \
--out dist/main-win.exe \
--icon "1,icon.ico" \
Expand Down
3 changes: 2 additions & 1 deletion adapter-warthog-websocket/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"vite-tsconfig-paths": "^5.1.3",
"pkg": "^5.8.1",
"vite": "^5.4.11"
}
},
"type": "module"
}
Binary file modified bun.lockb
Binary file not shown.
8 changes: 4 additions & 4 deletions client/package.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
npx electron-packager . Posthoc --dir dist --platform=win32 --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
npx electron-packager . Posthoc --dir dist --platform=linux --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
npx electron-packager . Posthoc --dir dist --platform=darwin --arch=arm64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
npx electron-packager . Posthoc --dir dist --platform=darwin --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
bunx electron-packager . Posthoc --dir dist --platform=win32 --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
bunx electron-packager . Posthoc --dir dist --platform=linux --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
bunx electron-packager . Posthoc --dir dist --platform=darwin --arch=arm64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin
bunx electron-packager . Posthoc --dir dist --platform=darwin --arch=x64 --electronVersion=26.2.1 --ignore node_modules --ignore src --ignore tsconfig.json --ignore vite.config.ts --ignore .eslintrc.json --ignore .unimportedrc.json --ignore package.sh --overwrite --icon ./dist/favicon --out bin

cd bin

Expand Down

0 comments on commit 1dd44df

Please sign in to comment.