diff --git a/.github/workflows/pre-releases.yml b/.github/workflows/pre-releases.yml deleted file mode 100644 index 923cb587..00000000 --- a/.github/workflows/pre-releases.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Pre-releases - -on: - workflow_dispatch: - push: - branches: - - master - -jobs: - build: - uses: pimalaya/nix/.github/workflows/pre-releases.yml@master - secrets: inherit - with: - project: himalaya diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index f94de2b8..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: release - -on: - push: - tags: - - v* - -jobs: - create-release: - runs-on: ubuntu-latest - outputs: - upload_url: ${{ steps.create-release.outputs.upload_url }} - steps: - - name: Create release - id: create-release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - draft: false - prerelease: false - - deploy-releases: - runs-on: ${{ matrix.os }} - needs: create-release - strategy: - fail-fast: false - matrix: - include: - - os: ubuntu-latest - host: x86_64-linux - target: x86_64-linux - - os: ubuntu-latest - host: x86_64-linux - target: aarch64-linux - - os: ubuntu-latest - host: x86_64-linux - target: x86_64-windows - - os: macos-13 - host: x86_64-darwin - target: x86_64-darwin - - os: macos-14 - host: aarch64-darwin - target: aarch64-darwin - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@v27 - with: - nix_path: nixpkgs=channel:nixos-24.05 - extra_nix_config: | - experimental-features = nix-command flakes - - uses: cachix/cachix-action@v15 - with: - name: soywod - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - extraPullNames: nix-community - - name: Build release archive - run: | - nix build -L --expr " - (builtins.getFlake \"git+file://${PWD}?shallow=1&rev=$(git rev-parse HEAD)\") - .outputs.packages.${{ matrix.host }}.${{ matrix.target }}.overrideAttrs { - GIT_DESCRIBE = \"$(git describe)\"; - }" - cp result/himalaya* . - - name: Upload tgz release archive - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-release.outputs.upload_url }} - asset_path: himalaya.tgz - asset_name: himalaya.${{ matrix.target }}.tgz - asset_content_type: application/gzip - - name: Upload zip release archive - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-release.outputs.upload_url }} - asset_path: himalaya.zip - asset_name: himalaya.${{ matrix.target }}.zip - asset_content_type: application/zip diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml new file mode 100644 index 00000000..d2d02426 --- /dev/null +++ b/.github/workflows/releases.yml @@ -0,0 +1,15 @@ +name: Releases + +on: + push: + tags: + - v* + branches: + - master + +jobs: + release: + uses: pimalaya/nix/.github/workflows/releases.yml@master + secrets: inherit + with: + project: himalaya diff --git a/Cargo.lock b/Cargo.lock index 23eee922..39601c3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1220,7 +1220,7 @@ dependencies = [ [[package]] name = "email-lib" version = "0.26.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "async-trait", "chrono", @@ -1848,7 +1848,7 @@ dependencies = [ [[package]] name = "http-lib" version = "0.1.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "thiserror 1.0.69", "tokio", @@ -2295,7 +2295,7 @@ dependencies = [ [[package]] name = "keyring-lib" version = "1.0.2" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "keyring", "once_cell", @@ -2620,7 +2620,7 @@ dependencies = [ [[package]] name = "mml-lib" version = "1.1.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "async-recursion", "chumsky", @@ -2819,7 +2819,7 @@ dependencies = [ [[package]] name = "oauth-lib" version = "1.0.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "http-lib", "oauth2", @@ -3109,7 +3109,7 @@ dependencies = [ [[package]] name = "pgp-lib" version = "1.0.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "async-recursion", "futures", @@ -3127,7 +3127,7 @@ dependencies = [ [[package]] name = "pimalaya-tui" version = "0.1.0" -source = "git+https://github.com/pimalaya/tui#a8a816e09cffa020263bcb79568d66f504c4a4cd" +source = "git+https://github.com/pimalaya/tui#7d30c7d1fa790de4f695f2efa22bef60d88d727a" dependencies = [ "async-trait", "clap", @@ -3288,7 +3288,7 @@ dependencies = [ [[package]] name = "process-lib" version = "1.0.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "serde", "thiserror 1.0.69", @@ -3755,7 +3755,7 @@ dependencies = [ [[package]] name = "secret-lib" version = "1.0.0" -source = "git+https://github.com/pimalaya/core#6c6c01cecf20e30061e862fed80fbfe030a4473e" +source = "git+https://github.com/pimalaya/core#adbac1709d2bd4444381a5fe4035db682db637b0" dependencies = [ "keyring-lib", "process-lib", diff --git a/README.md b/README.md index 832801d8..d705f1dd 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ $ himalaya envelope list --account posteo --folder Archives.FOSS --page 2 These commands install the latest binary from the GitHub [releases](https://github.com/pimalaya/himalaya/releases) section. - If you want a more up-to-date version than the latest release, check out the [`pre-releases`](https://github.com/pimalaya/himalaya/actions/workflows/pre-releases.yml) GitHub workflow and look for the *Artifacts* section. You should find a pre-built binary matching your OS. These pre-built binaries are built from the `master` branch. + If you want a more up-to-date version than the latest release, check out the [`releases`](https://github.com/pimalaya/himalaya/actions/workflows/releases.yml) GitHub workflow and look for the *Artifacts* section. You should find a pre-built binary matching your OS. These pre-built binaries are built from the `master` branch. *Such binaries are built with the default cargo features. If you want to enable or disable a feature, please use another installation method.* diff --git a/install.sh b/install.sh index 11d8c19a..cecbf8b6 100644 --- a/install.sh +++ b/install.sh @@ -9,7 +9,7 @@ die() { DESTDIR="${DESTDIR:-}" PREFIX="${PREFIX:-"$DESTDIR/usr/local"}" -RELEASES_URL="https://github.com/soywod/himalaya/releases" +RELEASES_URL="https://github.com/pimalaya/himalaya/releases" binary=himalaya system=$(uname -s | tr [:upper:] [:lower:]) @@ -23,14 +23,17 @@ case $system in linux|freebsd) case $machine in x86_64) target=x86_64-linux;; + x86|i386|i686) target=i686-linux;; arm64|aarch64) target=aarch64-linux;; + armv6l) target=armv6l-linux;; + armv7l) target=armv7l-linux;; *) die "Unsupported machine $machine for system $system";; esac;; darwin) case $machine in - x86_64) target=x86_64-macos;; - arm64|aarch64) target=aarch64-macos;; + x86_64) target=x86_64-darwin;; + arm64|aarch64) target=aarch64-darwin;; *) die "Unsupported machine $machine for system $system";; esac;;