From 30599931bc9416eabdec83f58591e298e8e627d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 1 May 2023 11:21:23 +0200 Subject: [PATCH 1/2] add test zip workflow --- .github/workflows/zip.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/zip.yml diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml new file mode 100644 index 0000000..1793730 --- /dev/null +++ b/.github/workflows/zip.yml @@ -0,0 +1,14 @@ +name: zip + +on: + push: + +jobs: + deploy_windows_github: + runs-on: windows-latest + steps: + - name: Test zip + run: | + mkdir man + mkdir completions + Compress-Archive -Path man,completions -DestinationPath himalaya.zip From 7844a7900904891206e855579a5647d681afb4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 1 May 2023 11:41:39 +0200 Subject: [PATCH 2/2] fix release and test --- .github/workflows/release.yml | 18 +++++++++--------- .github/workflows/tests.yml | 2 +- .github/workflows/zip.yml | 14 -------------- 3 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/zip.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 083096f..6bd409b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v20 with: - nix_path: nixpkgs=channel:nixos-unstable + nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | experimental-features = nix-command flakes - uses: cachix/cachix-action@v12 @@ -63,7 +63,7 @@ jobs: nix run .#${{ matrix.target }} completion fish > ./completions/himalaya.fish nix run .#${{ matrix.target }} completion powershell > ./completions/himalaya.powershell nix run .#${{ matrix.target }} completion zsh > ./completions/himalaya.zsh - tar -czf himalaya.tar.gz himalaya* man completions + tar -czf himalaya.tgz himalaya* man completions zip -r himalaya.zip himalaya* man completions - name: Upload tar.gz release asset uses: actions/upload-release-asset@v1 @@ -71,8 +71,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create_release.outputs.upload_url }} - asset_path: himalaya.tar.gz - asset_name: himalaya-${{ matrix.target }}.tar.gz + asset_path: himalaya.tgz + asset_name: himalaya-${{ matrix.target }}.tgz asset_content_type: application/gzip - name: Upload zip release asset uses: actions/upload-release-asset@v1 @@ -111,16 +111,16 @@ jobs: ./himalaya.exe completion fish > ./completions/himalaya.fish ./himalaya.exe completion powershell > ./completions/himalaya.powershell ./himalaya.exe completion zsh > ./completions/himalaya.zsh - tar -czf himalaya.tar.gz himalaya.exe man completions - tar -czf himalaya.zip himalaya.exe man completions + tar -czf himalaya.tgz himalaya.exe man completions + Compress-Archive -Path himalaya.exe,man,completions -DestinationPath himalaya.zip - name: Upload tar.gz release asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create_release.outputs.upload_url }} - asset_path: himalaya.tar.gz - asset_name: himalaya-windows.tar.gz + asset_path: himalaya.tgz + asset_name: himalaya-windows.tgz asset_content_type: application/gzip - name: Upload zip release asset uses: actions/upload-release-asset@v1 @@ -141,7 +141,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v20 with: - nix_path: nixpkgs=channel:nixos-unstable + nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | experimental-features = nix-command flakes - name: Publish library to crates.io diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f04397b..11f123c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v20 with: - nix_path: nixpkgs=channel:nixos-unstable + nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | experimental-features = nix-command flakes - uses: cachix/cachix-action@v12 diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml deleted file mode 100644 index 1793730..0000000 --- a/.github/workflows/zip.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: zip - -on: - push: - -jobs: - deploy_windows_github: - runs-on: windows-latest - steps: - - name: Test zip - run: | - mkdir man - mkdir completions - Compress-Archive -Path man,completions -DestinationPath himalaya.zip