Skip to content

Commit

Permalink
#718 Deprecate Tauri Desktop build
Browse files Browse the repository at this point in the history
  • Loading branch information
joepio committed Dec 4, 2023
1 parent 818f88d commit 59fef87
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 64 deletions.
102 changes: 51 additions & 51 deletions .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,58 +50,58 @@ jobs:
# (required)
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-tauri:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- name: setup node
uses: actions/setup-node@v1
with:
node-version: 12
- name: install Rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: install webkit2gtk and
sudo apt-get install -y webkit2gtk-4.0 libappindicator3 (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
- name: Get Changelog Entry
id: changelog_reader
uses: mindsers/changelog-reader-action@v2
with:
version: ${{ steps.tag_name.outputs.current_version }}
path: CHANGELOG.md
- uses: pnpm/[email protected]
name: Install pnpm
id: pnpm-install
with:
version: 8
run_install: false
# publish-tauri:
# strategy:
# fail-fast: false
# matrix:
# platform: [macos-latest, ubuntu-latest, windows-latest]
# runs-on: ${{ matrix.platform }}
# steps:
# - uses: actions/checkout@v2
# - name: setup node
# uses: actions/setup-node@v1
# with:
# node-version: 12
# - name: install Rust stable
# uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
# - name: install webkit2gtk and
# sudo apt-get install -y webkit2gtk-4.0 libappindicator3 (ubuntu only)
# if: matrix.platform == 'ubuntu-latest'
# run: |
# sudo apt-get update
# sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
# - name: Get Changelog Entry
# id: changelog_reader
# uses: mindsers/changelog-reader-action@v2
# with:
# version: ${{ steps.tag_name.outputs.current_version }}
# path: CHANGELOG.md
# - uses: pnpm/[email protected]
# name: Install pnpm
# id: pnpm-install
# with:
# version: 8
# run_install: false

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
# TODO: https://github.com/atomicdata-dev/atomic-server/issues/237
# ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
# APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
# APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
# APPLE_ID: ${{ secrets.APPLE_ID }}
# APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
with:
tagName: ${{ steps.changelog_reader.outputs.version }}
releaseName: ${{ steps.changelog_reader.outputs.version }}
releaseBody: ${{ steps.changelog_reader.outputs.changes }}
releaseDraft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }}
prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}
# - uses: tauri-apps/tauri-action@v0
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
# # TODO: https://github.com/atomicdata-dev/atomic-server/issues/237
# # ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
# # APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
# # APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
# # APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
# # APPLE_ID: ${{ secrets.APPLE_ID }}
# # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
# with:
# tagName: ${{ steps.changelog_reader.outputs.version }}
# releaseName: ${{ steps.changelog_reader.outputs.version }}
# releaseBody: ${{ steps.changelog_reader.outputs.changes }}
# releaseDraft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }}
# prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}

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

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

Expand Down
9 changes: 3 additions & 6 deletions CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,8 @@ So please first send an e-mail to [email protected] describing the issue, and then
## Releases, Versioning and Tagging

1. Commit changes
2. Update the `tauri.conf.json` manually to the new version.
3. Make sure all tests run properly
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.
1. Make sure all tests run properly
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.

The following should be triggered automatically:

Expand All @@ -212,7 +211,6 @@ Note:

- We use [semver](https://semver.org/), and are still quite far from 1.0.0.
- 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.
- 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).

### CI situation

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

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

#### Publishing to Cargo

Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"server",
"cli",
"lib",
# Disable to fix MUSL build
# Tauri build is deprecated, see
# https://github.com/atomicdata-dev/atomic-server/issues/718
# "desktop",
]
16 changes: 11 additions & 5 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ pipeline:
BUILD +build
BUILD +e2e

build-platforms:
BUILD \
--platform=linux/amd64 \
--platform=linux/arm/v7 \
+build

install:
RUN apt-get update -qq
RUN apt-get install --no-install-recommends -qq autoconf autotools-dev libtool-bin clang cmake bsdmainutils
# RUN apt-get install --no-install-recommends -qq autoconf autotools-dev libtool-bin clang cmake bsdmainutils
RUN rustup component add clippy
RUN rustup component add rustfmt
# Atomic-Server deps
RUN rustup target add x86_64-unknown-linux-musl
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
# RUN rustup target add x86_64-unknown-linux-musl
# 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
# Tauri deps
RUN apt install -y libwebkit2gtk-4.0-dev
RUN update-ca-certificates
# RUN apt install -y libwebkit2gtk-4.0-dev
# RUN update-ca-certificates
# Call +INIT before copying the source file to avoid installing depencies every time source code changes.
# This parametrization will be used in future calls to UDCs of the library
DO rust+INIT --keep_fingerprints=true
Expand Down
4 changes: 3 additions & 1 deletion desktop/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Atomic-Server Desktop (powered by Tauri)

[_WARNING: THIS SUB-PROJECT IS NOT ACTIVELY MAINTAINED_](https://github.com/atomicdata-dev/atomic-server/issues/718)

Desktop release for Atomic-Server.
[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.

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

## Limitations

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

0 comments on commit 59fef87

Please sign in to comment.