Skip to content

Commit

Permalink
Linux support (#142)
Browse files Browse the repository at this point in the history 
* add linuxsetup

* 🔄 "add linuxsetup
"
Update anysphere/client commit SHA
🔗 6509c6a

* 🔄 "update systemd path
"
Update anysphere/client commit SHA
🔗 c452dcd

* 🔄 "maybe start daemon?
"
Update anysphere/client commit SHA
🔗 3cf59e7

* 🔄 "clean up package scripts
"
Update anysphere/client commit SHA
🔗 697f33c

* use buildbuddy hopefully

* 🔄 "use buildbuddy hopefully
"
Update anysphere/asphr commit SHA
🔗 anysphere/asphr@17b2f0c

* 🔄 "fix includes
"
Update anysphere/client commit SHA
🔗 d8eacf4

* 🔄 "update package.json
"
Update anysphere/client commit SHA
🔗 c0bec77

* 🔄 "fix linux maybe
"
Update anysphere/client commit SHA
🔗 ed4201c

* 🔄 "remove linuxopt
"
Update anysphere/client commit SHA
🔗 7045f71

* 🔄 "remove commented out code
"
Update anysphere/client commit SHA
🔗 62264ed

* 🔄 "use linuxopt in package.json
"
Update anysphere/client commit SHA
🔗 bf027e5

* 🔄 "add ts-node
"
Update anysphere/client commit SHA
🔗 73889e7

* 🔄 "fix imports
"
Update anysphere/client commit SHA
🔗 aaf3885

* 🔄 "remove unused imports
"
Update anysphere/client commit SHA
🔗 6c64a6d

* 🔄 "maybe fix
"
Update anysphere/client commit SHA
🔗 9571799

* 🔄 "fix things
"
Update anysphere/client commit SHA
🔗 95d32cc

* 🔄 "more print
"
Update anysphere/client commit SHA
🔗 4923c59

* 🔄 "ship
"
Update anysphere/client commit SHA
🔗 df404ab

* 🔄 "fix things
"
Update anysphere/client commit SHA
🔗 f81e132

* 🔄 "fix command
"
Update anysphere/client commit SHA
🔗 6c24360

* 🔄 "fix writability issue
"
Update anysphere/client commit SHA
🔗 0fb448f

* 🔄 "finally fix everything???
"
Update anysphere/client commit SHA
🔗 5e7bc00

* 🔄 "fix all linux stuff
"
Update anysphere/client commit SHA
🔗 fe62959

* add linux appimage

* fix linux

* update

* 🔄 "update
"
Update anysphere/client commit SHA
🔗 bd2849b

* linux 0.1.13 published

* 🔄 "linux 0.1.13 published
"
Update anysphere/client commit SHA
🔗 d6ee58c

* new deploy

* deploy updates .me page too

* fix linux

* linux version should be 0.1.13

* deploy!

* 🔄 "change permissions of the correct file
"
Update anysphere/client commit SHA
🔗 4313299

* 🔄 "catch error
"
Update anysphere/client commit SHA
🔗 04eafee

* 🔄 "display register modal if daemon dead
"
Update anysphere/client commit SHA
🔗 d94340f

* push 0.1.14 for linux

* 🔄 "push 0.1.14 for linux
"
Update anysphere/client commit SHA
🔗 7468aa3

* use sd not sed

* 🔄 "spacing ok
"
Update anysphere/client commit SHA
🔗 75fcdcc

* push 0.1.15

* 🔄 "push 0.1.15
"
Update anysphere/client commit SHA
🔗 fa27020

* new commits things

* 🔄 "use sd not sed
"
Update anysphere/client commit SHA
🔗 4923247

* ban sed

* trunk fmt

Co-authored-by: Sualeh Asif <[email protected]>
  • Loading branch information
@arvid220u @sualeh-anysphere
arvid220u and sualeh-anysphere authored Aug 12, 2022
1 parent 7725d9b commit 7d7fecb
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 21 deletions.
10 changes: 5 additions & 5 deletions .bazelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ build --repo_env=RULES_RUST_TOOLCHAIN_INCLUDE_RUSTC_SRCS=true
try-import %workspace%/.user.bazelrc

# setting up remote caching
#build --bes_results_url=https://app.buildbuddy.io/invocation/
#build --bes_backend=grpcs://remote.buildbuddy.io
#build --remote_cache=grpcs://remote.buildbuddy.io
#build --remote_upload_local_results
#build --remote_timeout=3600
build --bes_results_url=https://app.buildbuddy.io/invocation/
build --bes_backend=grpcs://remote.buildbuddy.io
build --remote_cache=grpcs://remote.buildbuddy.io
build --remote_upload_local_results
build --remote_timeout=3600
# build --experimental_remote_cache_compression
# build --experimental_remote_cache_async
# build --remote_download_toplevel
Expand Down
12 changes: 4 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,12 @@ publish-alpha-OLD: package-mac-arm64 package-mac-x86_64
./publish.sh arm64 x86_64
echo "Client successfully published to s3! Download from URL above."

# the NEW package functions use .dmg and publish to github
publish-mac-arm64: loadenv
pushd client/gui && npm install && PUBLISH_ASPHR=true npm run package-mac-arm64 && popd

publish-mac-x86_64: loadenv
pushd client/gui && npm install && PUBLISH_ASPHR=true npm run package-mac-x86_64 && popd

publish-mac: loadenv
./publish-mac.sh

publish-linux: loadenv
./publish-linux.sh

publish-landing:
pushd website/landing && ./deploy.sh && popd

Expand All @@ -75,4 +71,4 @@ update-gui-proto:

clean:
docker rmi -f server
docker rmi -f minimal-server
docker rmi -f minimal-server
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

git_repository(
name = "asphr",
commit = "4182ae04067424cb70c3cb310187c15bb9c383f6", # autoupdate anysphere/asphr
commit = "17b2f0cc4db717935c8780c45ae7aefa6297d94d", # autoupdate anysphere/asphr
init_submodules = True,
remote = "https://github.com/anysphere/asphr.git",
)
Expand Down Expand Up @@ -39,7 +39,7 @@ setup_asphr("@asphr")

git_repository(
name = "client",
commit = "f172b0043b109c8e1a640e88c673ab3c5903f5f2", # autoupdate anysphere/client
commit = "492324724ee9aac6a90f01708b5f165f53d5bd88", # autoupdate anysphere/client
init_submodules = True,
remote = "https://github.com/anysphere/client.git",
)
Expand Down
17 changes: 17 additions & 0 deletions publish-linux.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

if [[ -z ${ASPHR_VERSION} ]]; then
echo "ASPHR_VERSION is empty. Please set it to the version of asphr you want to publish."
exit 1
fi

sd "version.*" "version\": \"${ASPHR_VERSION}\"," client/gui/release/app/package.json
pushd client/gui || exit
npm install
PUBLISH_ASPHR=true npm run package-linux
popd || exit

# update version!
sd "LINUX_ASPHR_VERSION =.*" "LINUX_ASPHR_VERSION = \"${ASPHR_VERSION}\";" website/landing/src/pages/download.tsx
sd "LINUX_ASPHR_VERSION =.*" "LINUX_ASPHR_VERSION = \"${ASPHR_VERSION}\";" website/landing-experiment/src/pages/download.tsx
echo "Updated version. Please deploy the landing page, and publish the release, when ready."
11 changes: 6 additions & 5 deletions publish-mac.sh
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
#!/usr/bin/env bash

if [[ -z "${ASPHR_VERSION}" ]]; then
echo "ASPHR_VERSION is empty. Please set it to the version of asphr you want to publish."
exit 1
if [[ -z ${ASPHR_VERSION} ]]; then
echo "ASPHR_VERSION is empty. Please set it to the version of asphr you want to publish."
exit 1
fi

sed -i '' "s/version.*/version\": \"${ASPHR_VERSION}\",/g" client/gui/release/app/package.json
sd "version.*" "version\": \"${ASPHR_VERSION}\"," client/gui/release/app/package.json
pushd client/gui || exit
npm install
PUBLISH_ASPHR=true npm run package-mac
popd || exit

# update version!
sed -i '' "s/ASPHR_VERSION =.*/ASPHR_VERSION = \"${ASPHR_VERSION}\";/g" website/landing/src/pages/download.tsx
sd "MAC_ASPHR_VERSION =.*" "MAC_ASPHR_VERSION = \"${ASPHR_VERSION}\";" website/landing/src/pages/download.tsx
sd "MAC_ASPHR_VERSION =.*" "MAC_ASPHR_VERSION = \"${ASPHR_VERSION}\";" website/landing-experiment/src/pages/download.tsx
echo "Updated version. Please deploy the landing page, and publish the release, when ready."
2 changes: 1 addition & 1 deletion research/security-definition
Submodule security-definition updated 4 files
+40 −53 asphr_definition.tex
+4 −2 general_definition.tex
+ − main.pdf
+2 −0 preamble.tex

0 comments on commit 7d7fecb

Please sign in to comment.