diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c37d93..4b47f84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: run-tests: true cache-key: flatpak-builder-${{ github.sha }} upload-artifact: false - - name: Vendor dependencies + - name: Checksum for vendored dependencies run: ./build-aux/dist-vendor.sh dist . && tar czf vendor.tar.gz dist - name: Vendor dependencies run: sha256sum vendor.tar.gz > vendor.tar.gz.sha256sum diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..125f8be --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,56 @@ +--- +name: "tagged-release" + +on: + push: + tags: + - "v[0-9]+.0-9]+.0-9]+" + +jobs: + flatpak: + name: Flatpak + runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:gnome-46 + options: --privileged + steps: + - name: Install pre-requisits + run: dnf update -y && dnf install -y git-lfs cargo + - uses: actions/checkout@v4 + with: + lfs: true + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 + with: + bundle: toolboxtuner.flatpak + manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.json + run-tests: true + cache-key: flatpak-builder-${{ github.sha }} + upload-artifact: false + - name: Vendor dependencies + run: ./build-aux/dist-vendor.sh dist . && tar czf vendor.tar.gz dist + - name: Checksum for vendored dependencies + run: sha256sum vendor.tar.gz > vendor.tar.gz.sha256sum + - uses: actions/upload-artifact@v4 + with: + path: | + *.tar.gz + *.flatpak + *.sha256sum + - name: ls + run: ls + publish-prerelease: + needs: [flatpak] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v4 + - name: Show files + run: ls -R + - uses: "dciborow/action-github-releases@v1.0.1" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + prerelease: false + files: | + **/*.flatpak + **/*.tar.gz + **/*.sha256sum + diff --git a/Cargo.lock b/Cargo.lock index 5a57cc6..e319e3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "toolbox-tuner" -version = "0.0.1" +version = "0.1.0" dependencies = [ "gettext-rs", "relm4", diff --git a/Cargo.toml b/Cargo.toml index 1f05349..c475898 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "toolbox-tuner" -version = "0.0.1" +version = "0.1.0" authors = ["Hannes Kuchelmeister "] edition = "2021" publish = false diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.json b/build-aux/org.kuchelmeister.ToolboxTuner.json new file mode 100644 index 0000000..982002a --- /dev/null +++ b/build-aux/org.kuchelmeister.ToolboxTuner.json @@ -0,0 +1,52 @@ +{ + "id" : "org.kuchelmeister.ToolboxTuner", + "runtime" : "org.gnome.Platform", + "runtime-version" : "46", + "sdk" : "org.gnome.Sdk", + "sdk-extensions" : [ + "org.freedesktop.Sdk.Extension.rust-stable", + "org.freedesktop.Sdk.Extension.llvm15" + ], + "command" : "toolbox-tuner", + "finish-args" : [ + "--share=ipc", + "--socket=fallback-x11", + "--device=dri", + "--socket=wayland", + "--talk-name=org.freedesktop.Flatpak" + ], + "build-options" : { + "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm15/bin", + "prepend-ld-library-path" : "/usr/lib/sdk/llvm15/lib", + "build-args" : [ + "--share=network" + ], + "env" : { + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang", + "CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + }, + "test-args" : [ + "--socket=x11", + "--share=network" + ] + }, + "modules" : [ + { + "name" : "toolbox-tuner", + "buildsystem" : "meson", + "run-tests" : true, + "config-opts" : [ + "-Dprofile=default" + ], + "sources" : [ + { + "type" : "dir", + "path" : "../" + } + ] + } + ] +} diff --git a/data/org.kuchelmeister.ToolboxTuner.metainfo.xml.in.in b/data/org.kuchelmeister.ToolboxTuner.metainfo.xml.in.in index ca4d462..2fefa04 100644 --- a/data/org.kuchelmeister.ToolboxTuner.metainfo.xml.in.in +++ b/data/org.kuchelmeister.ToolboxTuner.metainfo.xml.in.in @@ -25,6 +25,13 @@ + + + Initial release with the following features. +

Start/Stop toolboxes

+

Open terminal inside toolboxes

+
+
https://github.com/13hannes11/toolbx-tuner diff --git a/meson.build b/meson.build index 4642994..2af9813 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'toolbox-tuner', 'rust', - version: '0.0.1', + version: '0.1.0', meson_version: '>= 0.59', # license: 'MIT', )