From ec7bc26f647b009c0af1db584c18dbceb62f6dce Mon Sep 17 00:00:00 2001 From: Hollow Man Date: Tue, 28 Mar 2023 19:08:40 +0300 Subject: [PATCH] Add kubescape.exe to the release assets Signed-off-by: Hollow Man --- .github/workflows/c-create-release.yaml | 17 ++++++++++++----- build.py | 3 +++ install.ps1 | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c-create-release.yaml b/.github/workflows/c-create-release.yaml index 8398e37d..eabe3c94 100644 --- a/.github/workflows/c-create-release.yaml +++ b/.github/workflows/c-create-release.yaml @@ -19,6 +19,10 @@ jobs: create-release: name: create-release runs-on: ubuntu-latest + env: + MAC_OS: macos-latest + UBUNTU_OS: ubuntu-latest + WINDOWS_OS: windows-latest # permissions: # contents: write steps: @@ -26,6 +30,11 @@ jobs: id: download-artifact with: path: . + + # TODO: kubescape-windows-latest is deprecated and should be removed + - name: Get kubescape.exe from kubescape-windows-latest + run: cp ./kubescape-${{ env.WINDOWS_OS }}/kubescape-${{ env.WINDOWS_OS }} ./kubescape-${{ env.WINDOWS_OS }}/kubescape.exe + - name: Set release token run: | if [ "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}" != "" ]; then @@ -35,10 +44,6 @@ jobs: fi - name: Release uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # ratchet:softprops/action-gh-release@v1 - env: - MAC_OS: macos-latest - UBUNTU_OS: ubuntu-latest - WINDOWS_OS: windows-latest with: token: ${{ env.TOKEN }} name: ${{ inputs.RELEASE_NAME }} @@ -47,14 +52,16 @@ jobs: draft: ${{ inputs.DRAFT }} fail_on_unmatched_files: true prerelease: false + # TODO: kubescape-windows-latest is deprecated and should be removed files: | + ./kubescape-${{ env.WINDOWS_OS }}/kubescape-${{ env.WINDOWS_OS }} ./kubescape-${{ env.MAC_OS }}/kubescape-${{ env.MAC_OS }} ./kubescape-${{ env.MAC_OS }}/kubescape-${{ env.MAC_OS }}.sha256 ./kubescape-${{ env.MAC_OS }}/kubescape-${{ env.MAC_OS }}.tar.gz ./kubescape-${{ env.UBUNTU_OS }}/kubescape-${{ env.UBUNTU_OS }} ./kubescape-${{ env.UBUNTU_OS }}/kubescape-${{ env.UBUNTU_OS }}.sha256 ./kubescape-${{ env.UBUNTU_OS }}/kubescape-${{ env.UBUNTU_OS }}.tar.gz - ./kubescape-${{ env.WINDOWS_OS }}/kubescape-${{ env.WINDOWS_OS }} + ./kubescape-${{ env.WINDOWS_OS }}/kubescape.exe ./kubescape-${{ env.WINDOWS_OS }}/kubescape-${{ env.WINDOWS_OS }}.sha256 ./kubescape-${{ env.WINDOWS_OS }}/kubescape-${{ env.WINDOWS_OS }}.tar.gz ./kubescapearm64-${{ env.MAC_OS }}/kubescape-arm64-${{ env.MAC_OS }} diff --git a/build.py b/build.py index b232acfa..6879001e 100644 --- a/build.py +++ b/build.py @@ -27,6 +27,9 @@ def get_build_dir(): def get_package_name(): if CURRENT_PLATFORM not in platformSuffixes: raise OSError("Platform %s is not supported!" % (CURRENT_PLATFORM)) + # # TODO: kubescape-windows-latest is deprecated and should be removed + # if CURRENT_PLATFORM == "Windows": return "kubescape.exe" + package_name = "kubescape-" if os.getenv("GOARCH"): package_name += os.getenv("GOARCH") + "-" diff --git a/install.ps1 b/install.ps1 index 342a671d..e2916fc1 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1,7 +1,7 @@ Write-Host "Installing Kubescape..." -ForegroundColor Cyan $BASE_DIR=$env:USERPROFILE + "\.kubescape" -$packageName = "/kubescape-windows-latest" +$packageName = "/kubescape.exe" # Get latest release url $config = Invoke-WebRequest "https://api.github.com/repos/kubescape/kubescape/releases/latest" | ConvertFrom-Json