cleanup

n0-computer · Apr 29, 2024 · 1cb89e8 · 1cb89e8
1 parent bfaf0d0
commit 1cb89e8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 63 deletions.
diff --git a/.github/scripts/upload_gh_asset.sh b/.github/scripts/upload_gh_asset.sh
diff --git a/.github/scripts/upload_gh_asset_win.sh b/.github/scripts/upload_gh_asset_win.sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,8 +18,6 @@ on:
   push:
     tags:
     - "v*"
-    branches:
-      - arqu/release_windows
 
 concurrency:
   group: release-${{ github.workflow }}-${{ github.ref }}
@@ -32,7 +30,7 @@ env:
   MSRV: "1.75"
   SCCACHE_CACHE_SIZE: "50G"
   BIN_NAMES: "iroh,iroh-relay,iroh-dns-server"
-  RELEASE_VERSION: "v0.14.1-test"
+  RELEASE_VERSION: ${{ github.event.inputs.release_version }}
 
 jobs:
     create-release:
@@ -249,43 +247,9 @@ jobs:
             }
             $ASSETS = $ASSETS -join ','
             Add-Content -Path $env:GITHUB_ENV -Value "ASSET=$ASSETS"
-        
-        - name: Install file
-          shell: bash
-          if: ${{ startsWith(matrix.os, 'ubuntu') }}
-          run: sudo apt update && sudo apt install -y file
-
-        # - name: Upload release archives
-        #   if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push') && matrix.os != 'windows-latest'
-        #   shell: bash
-        #   run: .github/scripts/upload_gh_asset.sh "${{ secrets.GITHUB_TOKEN }}" "${{ needs.create-release.outputs.upload_url }}" "${{ env.ASSET }}"
-
-        # - name: Upload release archives (windows)
-        #   if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push') && matrix.os == 'windows-latest'
-        #   # This exists purely because the GH runners don't properly escape the path to the bash script and the WSL fails to run it.
-        #   shell: pwsh
-        #   run: bash .github/scripts/upload_gh_asset_win.sh "${{ secrets.GITHUB_TOKEN }}" "" "${{ env.ASSET }}"
 
-        - uses: n0-computer/actions-upload-release-asset@arqu/multi_ul
+        - uses: n0-computer/actions-upload-release-asset@main
           if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push')
           with:
             upload_url: ${{ needs.create-release.outputs.upload_url }}
             asset_path: ${{ env.ASSET }}
-
-        # - uses: shogo82148/actions-upload-release-asset@v1
-        #   if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push') && matrix.os == 'windows-latest'
-        #   with:
-        #     upload_url: ${{ needs.create-release.outputs.upload_url }}
-        #     asset_path: iroh-${{ needs.create-release.outputs.release_version }}-${{ matrix.cargo_targets }}.zip
-
-        # - uses: shogo82148/actions-upload-release-asset@v1
-        #   if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push') && matrix.os == 'windows-latest'
-        #   with:
-        #     upload_url: ${{ needs.create-release.outputs.upload_url }}
-        #     asset_path: iroh-relay-${{ needs.create-release.outputs.release_version }}-${{ matrix.cargo_targets }}.zip
-
-        # - uses: shogo82148/actions-upload-release-asset@v1
-        #   if: (github.event.inputs.upload_artifacts == 'true' || github.event_name == 'push') && matrix.os == 'windows-latest'
-        #   with:
-        #     upload_url: ${{ needs.create-release.outputs.upload_url }}
-        #     asset_path: iroh-dns-server-${{ needs.create-release.outputs.release_version }}-${{ matrix.cargo_targets }}.zip