Compare commits

...

6 Commits

Author SHA1 Message Date
Jonas Kruckenberg
0cc18d6031
Merge pull request #338 from JonasKruckenberg/renovate/pnpm-action-setup-2.x
chore(deps): update pnpm/action-setup action to v2.4.1
2024-08-21 15:40:11 +02:00
renovate[bot]
ac6c9f7184
chore(deps): update pnpm/action-setup action to v2.4.1 2024-08-21 10:55:29 +00:00
Jonas Kruckenberg
a5ebd085e1
Merge pull request #332 from JonasKruckenberg/renovate/tauri-packages
fix(deps): update tauri packages to v1.6.0
2024-08-21 12:54:35 +02:00
Jonas Kruckenberg
77da3385e8 update node version 2024-08-21 12:29:32 +02:00
renovate[bot]
7b1c26f6f7
fix(deps): update tauri packages to v1.6.0 2024-08-21 10:29:18 +00:00
Jonas Kruckenberg
31cf3d35ab fix: add arm64 2024-08-21 12:26:15 +02:00
10 changed files with 1698 additions and 1374 deletions

View File

@ -28,9 +28,9 @@ jobs:
git config --global user.email "${{ github.event.pusher.email }}"
- uses: actions/setup-node@v4.0.1
with:
node-version: '16.x'
node-version: 20
registry-url: 'https://registry.npmjs.org'
- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v2.4.1
name: Install pnpm
id: pnpm-install
with:
@ -60,8 +60,8 @@ jobs:
if: steps.covector.outputs.commandRan == 'version'
with:
token: ${{ secrets.GITHUB_TOKEN }}
title: "Publish New Versions"
commit-message: "publish new versions"
labels: "version updates"
branch: "release"
title: 'Publish New Versions'
commit-message: 'publish new versions'
labels: 'version updates'
branch: 'release'
body: ${{ steps.covector.outputs.change }}

View File

@ -1,4 +1,4 @@
name: "Test"
name: 'Test'
on:
workflow_dispatch:
@ -40,39 +40,39 @@ jobs:
runs-on: ${{ matrix.platform.os }}
steps:
- uses: actions/checkout@v4
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 18
- uses: actions/checkout@v4
- name: 'Setup Rust'
uses: actions-rs/toolchain@v1
with:
default: true
override: true
profile: minimal
toolchain: stable
target: ${{ matrix.platform.rust_target }}
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
- uses: Swatinem/rust-cache@v2
- name: 'Setup Rust'
uses: actions-rs/toolchain@v1
with:
default: true
override: true
profile: minimal
toolchain: stable
target: ${{ matrix.platform.rust_target }}
- name: install dependencies (ubuntu only)
if: matrix.platform.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
- uses: Swatinem/rust-cache@v2
- uses: JonasKruckenberg/tauri-build@main
id: tauri_build
with:
target: ${{ matrix.platform.rust_target }}
projectPath: ./test/fixture
- run: |
echo "${{ steps.tauri_build.outputs.artifacts }}"
# The artifacts output can now be used to upload the artifacts
- uses: actions/upload-artifact@v3
with:
name: artifacts
path: "${{ join(fromJSON(steps.tauri_build.outputs.artifacts), '\n') }}"
- name: install dependencies (ubuntu only)
if: matrix.platform.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
- uses: JonasKruckenberg/tauri-build@main
id: tauri_build
with:
target: ${{ matrix.platform.rust_target }}
projectPath: ./test/fixture
- run: |
echo "${{ steps.tauri_build.outputs.artifacts }}"
# The artifacts output can now be used to upload the artifacts
- uses: actions/upload-artifact@v3
with:
name: artifacts
path: "${{ join(fromJSON(steps.tauri_build.outputs.artifacts), '\n') }}"

View File

@ -4,10 +4,10 @@ A composable action to build your Tauri project.
## Usage
As opposed to the offical [tauri-action](https://github.com/tauri-apps/tauri-action) this action is as minimal as possible.
As opposed to the offical [tauri-action](https://github.com/tauri-apps/tauri-action) this action is as minimal as possible.
Instead of creating a GitHub release and uploading artifacts all-in-one, it provides outputs to conveniently compose together with other actions such as `actions/upload-artifact`, `actions/download-artifact` or `softprops/action-gh-release`.
This action needs both Node.JS and Cargo to be already setup.
This action needs both Node.JS and Cargo to be already setup.
### Minimal
@ -39,7 +39,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 20
- name: install Rust stable
uses: actions-rs/toolchain@v1
@ -88,7 +88,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 20
- name: install Rust stable
uses: actions-rs/toolchain@v1
@ -165,11 +165,11 @@ jobs:
runs-on: ${{ matrix.platform.os }}
steps:
- uses: actions/checkout@v3
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- name: 'Setup Rust'
uses: actions-rs/toolchain@v1

View File

@ -21,5 +21,5 @@ outputs:
artifacts:
description: 'JSON array of artifact paths produced by the build command'
runs:
using: 'node16'
using: 'node20'
main: 'dist/index.js'

BIN
dist/cli.darwin-arm64.node generated vendored Normal file

Binary file not shown.

26
dist/index.js generated vendored
View File

@ -1,6 +1,13 @@
require('./sourcemap-register.js');/******/ (() => { // webpackBootstrap
/******/ var __webpack_modules__ = ({
/***/ 8202:
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
module.exports = require(__nccwpck_require__.ab + "cli.darwin-arm64.node")
/***/ }),
/***/ 5731:
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
@ -109,7 +116,14 @@ function buildProject(options) {
'AppImage.tar.gz.sig',
'deb'
];
const windowsExts = ['exe', 'exe.zip', 'exe.zip.sig', 'msi', 'msi.zip', 'msi.zip.sig'];
const windowsExts = [
'exe',
'exe.zip',
'exe.zip.sig',
'msi',
'msi.zip',
'msi.zip.sig'
];
const artifactsLookupPattern = `${bundleDir}/*/!(linuxdeploy)*.{${[
...macOSExts,
linuxExts,
@ -2218,7 +2232,7 @@ switch (platform) {
if (localFileExisted) {
nativeBinding = __nccwpck_require__(9209)
} else {
nativeBinding = __nccwpck_require__(1202)
nativeBinding = __nccwpck_require__(8202)
}
} catch (e) {
loadError = e
@ -25835,14 +25849,6 @@ module.exports = eval("require")("@tauri-apps/cli-android-arm-eabi");
module.exports = eval("require")("@tauri-apps/cli-android-arm64");
/***/ }),
/***/ 1202:
/***/ ((module) => {
module.exports = eval("require")("@tauri-apps/cli-darwin-arm64");
/***/ }),
/***/ 4997:

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

3
dist/licenses.txt generated vendored
View File

@ -238,6 +238,9 @@ Apache-2.0 OR MIT
END OF TERMS AND CONDITIONS
@tauri-apps/cli-darwin-arm64
MIT
@tauri-apps/cli-darwin-x64
MIT

View File

@ -24,10 +24,11 @@
"license": "MIT",
"dependencies": {
"@actions/core": "^1.10.1",
"@tauri-apps/cli": "1.5.11",
"@tauri-apps/cli-darwin-x64": "1.5.11",
"@tauri-apps/cli-linux-x64-gnu": "1.5.11",
"@tauri-apps/cli-win32-x64-msvc": "1.5.11",
"@tauri-apps/cli": "1.6.0",
"@tauri-apps/cli-darwin-x64": "1.6.0",
"@tauri-apps/cli-darwin-arm64": "1.6.0",
"@tauri-apps/cli-linux-x64-gnu": "1.6.0",
"@tauri-apps/cli-win32-x64-msvc": "1.6.0",
"string-argv": "^0.3.2",
"tiny-glob": "^0.2.9"
},
@ -40,5 +41,6 @@
"js-yaml": "4.1.0",
"prettier": "3.0.3",
"typescript": "5.3.3"
}
},
"packageManager": "pnpm@9.7.1+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247"
}

2937
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff