Skip to content

Feat/p2p shipyard 0.4.x #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 25 commits into
base: main-0.4
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a3fb075
fix more serialization types
jost-s Jun 26, 2024
03fd902
ready for holo
jost-s Jul 15, 2024
2c8b1fc
WIP
mattyg Sep 18, 2024
a4bb5e5
building holochain with wasmer_wamr working on android
mattyg Sep 20, 2024
a0e28ce
feat: p2p-shipyard scaffolding
mattyg Sep 23, 2024
946630b
refactor: move android build nix setup to p2p-shipyard's flake.nix
mattyg Sep 23, 2024
01c6a6c
fix: compatability with latest profiles, fork of profiles to fix bug
mattyg Sep 24, 2024
f2eb683
chore: undefined connect url if injected via magic config
mattyg Sep 24, 2024
ae18e3b
fix: unnecessary websocket connect alternative
mattyg Sep 24, 2024
e4b86f1
fix(ui): adjust position of network info button in small viewports
mattyg Sep 24, 2024
09b0211
build: nix setup for building with wasmer_wamr flag for android
mattyg Sep 24, 2024
529bf43
Revert "Update README formatting again"
mattyg Sep 24, 2024
bfd9ec7
Revert "Update README formatting"
mattyg Sep 24, 2024
313e7c5
Revert "Update README with install instructions and updated links"
mattyg Sep 24, 2024
3a29c5d
feat: custom icons
mattyg Sep 24, 2024
195a2fc
Merge branch 'main-0.4' into feat/p2p-shipyard-0.4.x
mattyg Sep 24, 2024
106273b
build: bump nix actions
mattyg Sep 24, 2024
88d45a1
build: use hc-wasmer branch
mattyg Sep 24, 2024
4505952
wip: remove ci cargo cache
mattyg Sep 24, 2024
34eae37
Revert "wip: remove ci cargo cache"
mattyg Sep 25, 2024
e7527c2
chore:clippy
mattyg Sep 25, 2024
519423d
build(ui): package-lock
mattyg Sep 25, 2024
707d495
wip: drop cachix from gh action
mattyg Sep 25, 2024
229b6e6
wip: use nix-develop gh action step
mattyg Sep 25, 2024
7365748
wip: try nix ci cache
mattyg Sep 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 145 additions & 0 deletions .github/workflows/release-tauri-app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
name: "release-tauri-app"
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

jobs:
publish-happ:
permissions:
contents: write
runs-on: ubuntu-22.04
outputs:
releaseId: ${{ steps.create-release.outputs.id }}
appVersion: ${{ steps.version.outputs.APP_VERSION }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# Checks out a copy of your repository on the ubuntu-latest machine
- uses: actions/checkout@v3

- name: Install nix
uses: cachix/install-nix-action@v27
with:
github_access_token: $
nix_path: nixpkgs=channel:nixos-24.05

- uses: cachix/cachix-action@v15
with:
name: holochain-ci

- uses: cachix/cachix-action@v15
with:
name: holochain-open-dev

- uses: cachix/cachix-action@v15
with:
name: darksoil-studio

- name: Install and test
run: |
nix-store --gc
nix develop --no-update-lock-file --accept-flake-config --command bash -c "npm install && npm run build:happ"

- name: Retrieve version
run: |
echo "APP_VERSION=$(cat src-tauri/tauri.conf.json | grep -oP '(?<="version": ")[^"]*')" >> $GITHUB_OUTPUT
id: version

- id: create-release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: "workdir/mewsfeed.happ"
body: "See assets below to download and install this version."
name: Mewsfeed v${{ steps.version.outputs.APP_VERSION }}
tag: v${{ steps.version.outputs.APP_VERSION }}
prerelease: true
draft: true

release-tauri-app:
needs: publish-happ
strategy:
fail-fast: false
matrix:
include:
- platform: 'macos-latest' # for Arm based macs (M1 and above).
args: '--target aarch64-apple-darwin'
- platform: 'macos-latest' # for Intel based macs.
args: '--target x86_64-apple-darwin'
- platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
args: ''
- platform: 'windows-latest'
args: ''
env:
MACOSX_DEPLOYMENT_TARGET: 10.13

runs-on: ${{ matrix.platform }}
steps:
- name: Support longpaths
if: matrix.platform != 'ubuntu-22.04'
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# Checks out a copy of your repository on the ubuntu-latest machine
- uses: actions/checkout@v2

- name: setup node
uses: actions/setup-node@v1
with:
node-version: 20

- name: install Rust stable
uses: actions-rs/toolchain@v1
with:
override: true
toolchain: stable

- name: install x86_64 target
if: matrix.args == '--target x86_64-apple-darwin'
run: rustup target add x86_64-apple-darwin

- name: install Go stable
uses: actions/setup-go@v4
with:
go-version: "stable"

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev \
build-essential \
curl \
wget \
file \
libssl-dev \
libgtk-3-dev \
libayatana-appindicator3-dev \
librsvg2-dev \
javascriptcoregtk-4.1 \
libsoup-3.0 \
webkit2gtk-4.1

- name: Install and prepare
run: |
npm install

- name: Download release of the .happ
uses: robinraju/release-downloader@v1.10
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
releaseId: ${{ needs.publish-happ.outputs.releaseId }}
fileName: 'mewsfeed.happ'
out-file-path: 'workdir/'

- name: build the app
uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
releaseId: ${{ needs.publish-happ.outputs.releaseId }}
releaseDraft: true
prerelease: true
args: ${{ matrix.args }}
53 changes: 28 additions & 25 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,46 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest]
fail-fast: false
permissions:
id-token: "write"
contents: "read"

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: DeterminateSystems/flake-checker-action@main

- name: Run `nix build`
run: nix develop

- name: Install nix
uses: cachix/install-nix-action@v22
# - name: Set up cachix
# uses: cachix/cachix-action@v15
# with:
# name: holochain-ci

- name: Set up cachix
uses: cachix/cachix-action@v12
with:
name: holochain-ci

- name: Restore cargo and build from cache
uses: actions/cache/restore@v3
with:
path: |
.cargo
target
key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }}
restore-keys: |
${{ runner.os }}-build-

- name: Install nix packages
run: nix develop -c $SHELL -c "echo Nix packages installed"
# - name: Restore cargo and build from cache
# uses: actions/cache/restore@v3
# with:
# path: |
# .cargo
# target
# key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }}
# restore-keys: |
# ${{ runner.os }}-build-

- name: Install JS packages
run: nix develop -c $SHELL -c "npm ci"
run: nix develop -c npm ci

- name: Clippy
run: nix develop -c $SHELL -c "npm run cargo:clippy"
run: nix develop -c npm run cargo:clippy

- name: Check rust formatting
run: nix develop -c $SHELL -c "npm run cargo:fmt:check"
run: nix develop -c npm run cargo:fmt:check

- name: Build Happ
run: nix develop -c $SHELL -c "npm run build:happ"
run: nix develop -c npm run build:happ

- name: Save cargo and build to cache
uses: actions/cache/save@v3
Expand All @@ -65,4 +68,4 @@ jobs:
key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }}

- name: Test with tryorama
run: nix develop -c $SHELL -c "npm run test"
run: nix develop -c npm run test
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased


## 2023-09-12 v0.11.1
- feat: add ellipses to truncated agent pub keys, extend truncation to 15 chars, do not truncate only on creators / followers list




## 2023-09-12 v0.11.0
- feat: show avatar in lightbox upon clicking profile (#233)
- refactor: manage dialogs via stores, reduce duplicate components (#232)
Expand Down
Loading
Loading