Skip to content

Commit 59fef87

Browse files
committed
#718 Deprecate Tauri Desktop build
1 parent 818f88d commit 59fef87

File tree

6 files changed

+71
-64
lines changed

6 files changed

+71
-64
lines changed

.github/workflows/release-github.yml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -50,58 +50,58 @@ jobs:
5050
# (required)
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252

53-
publish-tauri:
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
platform: [macos-latest, ubuntu-latest, windows-latest]
58-
runs-on: ${{ matrix.platform }}
59-
steps:
60-
- uses: actions/checkout@v2
61-
- name: setup node
62-
uses: actions/setup-node@v1
63-
with:
64-
node-version: 12
65-
- name: install Rust stable
66-
uses: actions-rs/toolchain@v1
67-
with:
68-
toolchain: stable
69-
- name: install webkit2gtk and
70-
sudo apt-get install -y webkit2gtk-4.0 libappindicator3 (ubuntu only)
71-
if: matrix.platform == 'ubuntu-latest'
72-
run: |
73-
sudo apt-get update
74-
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
75-
- name: Get Changelog Entry
76-
id: changelog_reader
77-
uses: mindsers/changelog-reader-action@v2
78-
with:
79-
version: ${{ steps.tag_name.outputs.current_version }}
80-
path: CHANGELOG.md
81-
- uses: pnpm/[email protected]
82-
name: Install pnpm
83-
id: pnpm-install
84-
with:
85-
version: 8
86-
run_install: false
53+
# publish-tauri:
54+
# strategy:
55+
# fail-fast: false
56+
# matrix:
57+
# platform: [macos-latest, ubuntu-latest, windows-latest]
58+
# runs-on: ${{ matrix.platform }}
59+
# steps:
60+
# - uses: actions/checkout@v2
61+
# - name: setup node
62+
# uses: actions/setup-node@v1
63+
# with:
64+
# node-version: 12
65+
# - name: install Rust stable
66+
# uses: actions-rs/toolchain@v1
67+
# with:
68+
# toolchain: stable
69+
# - name: install webkit2gtk and
70+
# sudo apt-get install -y webkit2gtk-4.0 libappindicator3 (ubuntu only)
71+
# if: matrix.platform == 'ubuntu-latest'
72+
# run: |
73+
# sudo apt-get update
74+
# sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
75+
# - name: Get Changelog Entry
76+
# id: changelog_reader
77+
# uses: mindsers/changelog-reader-action@v2
78+
# with:
79+
# version: ${{ steps.tag_name.outputs.current_version }}
80+
# path: CHANGELOG.md
81+
# - uses: pnpm/[email protected]
82+
# name: Install pnpm
83+
# id: pnpm-install
84+
# with:
85+
# version: 8
86+
# run_install: false
8787

88-
- uses: tauri-apps/tauri-action@v0
89-
env:
90-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
92-
# TODO: https://github.com/atomicdata-dev/atomic-server/issues/237
93-
# ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
94-
# APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
95-
# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
96-
# APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
97-
# APPLE_ID: ${{ secrets.APPLE_ID }}
98-
# APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
99-
with:
100-
tagName: ${{ steps.changelog_reader.outputs.version }}
101-
releaseName: ${{ steps.changelog_reader.outputs.version }}
102-
releaseBody: ${{ steps.changelog_reader.outputs.changes }}
103-
releaseDraft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }}
104-
prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}
88+
# - uses: tauri-apps/tauri-action@v0
89+
# env:
90+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91+
# TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
92+
# # TODO: https://github.com/atomicdata-dev/atomic-server/issues/237
93+
# # ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
94+
# # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
95+
# # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
96+
# # APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
97+
# # APPLE_ID: ${{ secrets.APPLE_ID }}
98+
# # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
99+
# with:
100+
# tagName: ${{ steps.changelog_reader.outputs.version }}
101+
# releaseName: ${{ steps.changelog_reader.outputs.version }}
102+
# releaseBody: ${{ steps.changelog_reader.outputs.changes }}
103+
# releaseDraft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }}
104+
# prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}
105105

106106
upload-assets:
107107
strategy:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ See [STATUS.md](server/STATUS.md) to learn more about which features will remain
1010
- Fix locally searching for atomicdata.dev resources in external servers #706
1111
- Use Earthly for CI: building, testing, pushing Docker images #576
1212
- Host @tomic NPM docs [on Netlify](https://atomic-lib.netlify.app/) #707
13+
- Deprecate Tauri Desktop build #718
1314

1415
## [v0.36.0] - 2023-11-02
1516

CONTRIBUTE.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,8 @@ So please first send an e-mail to [email protected] describing the issue, and then
199199
## Releases, Versioning and Tagging
200200

201201
1. Commit changes
202-
2. Update the `tauri.conf.json` manually to the new version.
203-
3. Make sure all tests run properly
204-
4. Use `cargo workspaces version patch` (and maybe replace `patch` with the `minor`) to update all `cargo.toml` files in one command. You'll need to `cargo install cargo-workspaces` if this command is not possible.
202+
1. Make sure all tests run properly
203+
1. Use `cargo workspaces version patch` (and maybe replace `patch` with the `minor`) to update all `cargo.toml` files in one command. You'll need to `cargo install cargo-workspaces` if this command is not possible.
205204

206205
The following should be triggered automatically:
207206

@@ -212,7 +211,6 @@ Note:
212211

213212
- We use [semver](https://semver.org/), and are still quite far from 1.0.0.
214213
- The version for `atomic-lib` is the most important, and dictates the versions of `cli` and `server`. When `lib` changes minor version, `cli` and `server` should follow.
215-
- After publishing, update the `./desktop/latest-version.json` file. This is used for auto-updating desktop distributions. See [tauri docs](https://tauri.studio/docs/distribution/updater).
216214

217215
### CI situation
218216

@@ -226,8 +224,7 @@ If the CI scripts for some reason do not do their job (buildin releases, docker
226224
#### Building and publishing binaries
227225

228226
1. `cargo build --release`
229-
2. `cargo tauri build` (on every OS!)
230-
3. Create a release on github, add the binaries and tauri builds
227+
1. Create a release on github, add the binaries
231228

232229
#### Publishing to Cargo
233230

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ members = [
44
"server",
55
"cli",
66
"lib",
7-
# Disable to fix MUSL build
7+
# Tauri build is deprecated, see
8+
# https://github.com/atomicdata-dev/atomic-server/issues/718
89
# "desktop",
910
]

Earthfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ pipeline:
1414
BUILD +build
1515
BUILD +e2e
1616

17+
build-platforms:
18+
BUILD \
19+
--platform=linux/amd64 \
20+
--platform=linux/arm/v7 \
21+
+build
22+
1723
install:
1824
RUN apt-get update -qq
19-
RUN apt-get install --no-install-recommends -qq autoconf autotools-dev libtool-bin clang cmake bsdmainutils
25+
# RUN apt-get install --no-install-recommends -qq autoconf autotools-dev libtool-bin clang cmake bsdmainutils
2026
RUN rustup component add clippy
2127
RUN rustup component add rustfmt
2228
# Atomic-Server deps
23-
RUN rustup target add x86_64-unknown-linux-musl
24-
RUN apt update && apt install -y musl-tools musl-dev g++-x86-64-linux-gnu libc6-dev-amd64-cross libgtk-3-dev libsoup2.4-dev
29+
# RUN rustup target add x86_64-unknown-linux-musl
30+
# RUN apt update && apt install -y musl-tools musl-dev g++-x86-64-linux-gnu libc6-dev-amd64-cross libgtk-3-dev libsoup2.4-dev
2531
# Tauri deps
26-
RUN apt install -y libwebkit2gtk-4.0-dev
27-
RUN update-ca-certificates
32+
# RUN apt install -y libwebkit2gtk-4.0-dev
33+
# RUN update-ca-certificates
2834
# Call +INIT before copying the source file to avoid installing depencies every time source code changes.
2935
# This parametrization will be used in future calls to UDCs of the library
3036
DO rust+INIT --keep_fingerprints=true

desktop/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Atomic-Server Desktop (powered by Tauri)
22

3+
[_WARNING: THIS SUB-PROJECT IS NOT ACTIVELY MAINTAINED_](https://github.com/atomicdata-dev/atomic-server/issues/718)
4+
35
Desktop release for Atomic-Server.
46
[Tauri] takes care of native installers, app icons, system tray icons, menu items, self-update ([issue](https://github.com/atomicdata-dev/atomic-server/issues/158)) and more.
57

@@ -20,5 +22,5 @@ If you only want to work on the _server side_ of things, you can remove `devPath
2022

2123
## Limitations
2224

23-
- No way to pass flags to `atomic-sever` using the Tauri executable (although you can set ENV varibles)
25+
- No way to pass flags to `atomic-sever` using the Tauri executable (although you can set ENV variables)
2426
- No HTTPS support

0 commit comments

Comments
 (0)