aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml4
-rw-r--r--.gitignore1
-rw-r--r--README.md6
-rw-r--r--env.dist2
-rw-r--r--justfile10
5 files changed, 17 insertions, 6 deletions
diff --git a/.build.yml b/.build.yml
index cfb72e5..6b9c463 100644
--- a/.build.yml
+++ b/.build.yml
@@ -14,6 +14,9 @@ packages:
- python-poetry
- flatpak
- flatpak-builder
+ - gtk4
+ - libadwaita
+ - gtksourceview5
- fakeroot
- podman
sources:
@@ -26,6 +29,7 @@ secrets:
- eaecf3b4-a508-4fa6-a36e-6b9ed4468eae
- f80356df-eb81-487f-8739-fbf08bf204dc
- 05763ec6-2f17-46b5-90f6-963482975b8b
+ - e4ca0336-ca5a-4a9c-acb3-9cb645aa6cca
tasks:
- set_rust: |
cd map-linux
diff --git a/.gitignore b/.gitignore
index 615eddf..352d1ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ vendor
_build
_dist
dist
+.env
.flatpak-builder
./*.minisig
*.minisig
diff --git a/README.md b/README.md
index 64c4582..3296de2 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,12 @@ the variable `flatpak_cargo_generator` (eg.
). It expects this directory to have the poetry configuration, as it enables the
virtualenv using poetry.
+### Uploading
+
+The URL and path of the upload are controlled using two environment variables:
+`$DISTRIBUTION_HOST` and `$DISTRIBUTION_PATH`. To use them, you can use the
+`env.dist` included, copy it to `.env`
+
## Localization / Internationalization
This project uses gettext for translations. You can update the template files
diff --git a/env.dist b/env.dist
new file mode 100644
index 0000000..6363f95
--- /dev/null
+++ b/env.dist
@@ -0,0 +1,2 @@
+DISTRIBUTION_HOST=
+DISTRIBUTION_PATH=
diff --git a/justfile b/justfile
index b694d2c..31e37da 100644
--- a/justfile
+++ b/justfile
@@ -1,3 +1,5 @@
+set dotenv-load
+
# Configuration ################################################################
app_name := "map"
channel := "unstable"
@@ -21,10 +23,6 @@ appimage_container := "trixie"
all_containers := f"arch {{fedora_versions}} {{debian_versions}}"
container_image_prefix := "map-build"
-# Distribution Hosts -----------------------------------------------------------
-distribution_host := "deploy@build.r.bdr.sh"
-distribution_path := f"/srv/http/build.r.bdr.sh/{{app_name}}-linux"
-
# Build ########################################################################
# Setup the meson build directory.
@@ -234,8 +232,8 @@ _sign file version platform:
# Uploads a file and its signature.
_upload file:
- rsync -avz {{file}}.minisig {{distribution_host}}:{{distribution_path}}
- rsync -avz {{file}} {{distribution_host}}:{{distribution_path}}
+ rsync -avz {{file}}.minisig $DISTRIBUTION_HOST:$DISTRIBUTION_PATH
+ rsync -avz {{file}} $DISTRIBUTION_HOST:$DISTRIBUTION_PATH
# Sign and upload a file.
_sign_and_upload file: (_sign file channel architecture) (_upload file)