Commit 82e52987 authored by Sophie Herold's avatar Sophie Herold
Browse files

Merge branch 'ci' into 'master'

Get CI working

See merge request sophie-h/pika-pile!1
parents 076935e4 524a587f
cache: include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
key: ${CI_JOB_NAME}
paths:
- target/
before_script: flatpak:
- export PATH="$HOME/.cargo/bin:$PATH" image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.36'
- rustup update stable variables:
- rustup component add rustfmt MANIFEST_PATH: "build-aux/org.gnome.gitlab.sophie_h.PikaPileBackup.yml"
- rustup component add clippy MESON_ARGS: "-Dprofile=Devel"
- cargo install cargo-audit FLATPAK_MODULE: "pika-pile"
- rustc --version && cargo --version APP_ID: "org.gnome.gitlab.sophie_h.PikaPileBackup"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
BUNDLE: "pika-pile-backup-dev.flatpak"
extends: .flatpak
build: nightly:
stage: build extends: '.publish_nightly'
script: dependencies: ['flatpak']
- cargo build
code_check:
stage: test
script:
- cargo fmt -- --check
- cargo clippy
- cargo audit --deny-warnings
test:
stage: test
script:
- cargo test
- cargo test -- --ignored
release:
stage: deploy
only:
- tags
script:
- cargo build --release
- cp ./target/release/pika-pile ./
artifacts:
paths:
- pika-pile
...@@ -3,7 +3,7 @@ name = "pika-pile" ...@@ -3,7 +3,7 @@ name = "pika-pile"
description = "Simple backups based on borg" description = "Simple backups based on borg"
version = "0.1.0-beta.2" version = "0.1.0-beta.2"
authors = ["Sophie Herold <sophie@hemio.de>"] authors = ["Sophie Herold <sophie@hemio.de>"]
homepage = "https://git.hemio.de/sophie/pika-pile" homepage = "https://gitlab.gnome.org/sophie-h/pika-pile"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
......
...@@ -4,10 +4,10 @@ APP_ID=$(cat data/APPLICATION_ID) ...@@ -4,10 +4,10 @@ APP_ID=$(cat data/APPLICATION_ID)
REPO_NAME=pika-pile-dev REPO_NAME=pika-pile-dev
REPO_DIR=flatpak_repo REPO_DIR=flatpak_repo
flatpak remove de.hemio.PikaPileBackup -y flatpak remove $APP_ID -y
flatpak-builder --install-deps-from=https://dl.flathub.org/repo/ \ flatpak-builder --install-deps-from=https://dl.flathub.org/repo/ \
--user --verbose --force-clean -y --repo=$REPO_DIR flatpak_out build-aux/$APP_ID.yaml --user --verbose --force-clean -y --repo=$REPO_DIR flatpak_out build-aux/$APP_ID.yml
flatpak build-bundle $REPO_DIR $APP_ID.flatpak flatpak build-bundle $REPO_DIR $APP_ID.flatpak $APP_ID
flatpak --force remote-delete $REPO_NAME flatpak --force remote-delete $REPO_NAME
flatpak --user remote-add --no-gpg-verify $REPO_NAME $REPO_DIR flatpak --user remote-add --no-gpg-verify $REPO_NAME $REPO_DIR
flatpak --user install -y $REPO_NAME $APP_ID flatpak --user install -y $REPO_NAME $APP_ID
......
--- ---
app-id: de.hemio.PikaPileBackup app-id: org.gnome.gitlab.sophie_h.PikaPileBackup
build-options: build-options:
append-path: /usr/lib/sdk/rust-stable/bin append-path: /usr/lib/sdk/rust-stable/bin
build-args: build-args:
......
de.hemio.PikaPileBackup org.gnome.gitlab.sophie_h.PikaPileBackup
\ No newline at end of file \ No newline at end of file
datadir = get_option('prefix') / get_option('datadir') datadir = get_option('prefix') / get_option('datadir')
application_id = 'de.hemio.PikaPileBackup' application_id = 'org.gnome.gitlab.sophie_h.PikaPileBackup'
# Read more https://mesonbuild.com/Reference-manual.html#install_data # Read more https://mesonbuild.com/Reference-manual.html#install_data
install_data( install_data(
......
...@@ -6,6 +6,6 @@ Name=Pika Pile Backup ...@@ -6,6 +6,6 @@ Name=Pika Pile Backup
Comment=Simple backups based on borg Comment=Simple backups based on borg
Categories=System;GTK; Categories=System;GTK;
Icon=de.hemio.PikaPileBackup Icon=org.gnome.gitlab.sophie_h.PikaPileBackup
Exec=pika-pile --syslog Exec=pika-pile --syslog
Terminal=false Terminal=false
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application"> <component type="desktop-application">
<id>de.hemio.PikaPileBackup</id> <id>org.gnome.gitlab.sophie_h.PikaPileBackup</id>
<name>Pika Pile Backup</name> <name>Pika Pile Backup</name>
<summary>Simple backups based on borg</summary> <summary>Simple backups based on borg</summary>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</p> </p>
</description> </description>
<launchable type="desktop-id">de.hemio.PikaPileBackup.desktop</launchable> <launchable type="desktop-id">org.gnome.gitlab.sophie_h.PikaPileBackup.desktop</launchable>
<categories> <categories>
<category>System</category> <category>System</category>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment