From a29bf137d6f856077c6bb3407f1fae108d1a2485 Mon Sep 17 00:00:00 2001 From: Max Novich Date: Mon, 14 Jul 2025 09:36:14 -0700 Subject: [PATCH 1/3] fix checkout for non mac builds --- .github/workflows/bundle-desktop-linux.yml | 7 ++++--- .github/workflows/bundle-desktop-windows.yml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bundle-desktop-linux.yml b/.github/workflows/bundle-desktop-linux.yml index f31f80b4c42b..aec15e69c0f4 100644 --- a/.github/workflows/bundle-desktop-linux.yml +++ b/.github/workflows/bundle-desktop-linux.yml @@ -26,9 +26,10 @@ jobs: steps: # 1) Check out source - name: Checkout repository - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4 with: - ref: ${{ inputs.ref }} + # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior + ref: ${{ inputs.ref != '' && inputs.ref || '' }} fetch-depth: 0 # 2) Update versions before build @@ -264,4 +265,4 @@ jobs: path: | ui/desktop/out/make/deb/x64/*.deb ui/desktop/out/make/rpm/x64/*.rpm - if-no-files-found: error \ No newline at end of file + if-no-files-found: error diff --git a/.github/workflows/bundle-desktop-windows.yml b/.github/workflows/bundle-desktop-windows.yml index 37b2cbbf98eb..bcb9fbe0a8c1 100644 --- a/.github/workflows/bundle-desktop-windows.yml +++ b/.github/workflows/bundle-desktop-windows.yml @@ -43,9 +43,10 @@ jobs: steps: # 1) Check out source - name: Checkout repository - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4 with: - ref: ${{ inputs.ref }} + # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior + ref: ${{ inputs.ref != '' && inputs.ref || '' }} fetch-depth: 0 # 2) Configure AWS credentials for code signing From 74cf8fbc10207ca000b9492421be9909006cbd5c Mon Sep 17 00:00:00 2001 From: Max Novich Date: Mon, 14 Jul 2025 10:52:29 -0700 Subject: [PATCH 2/3] fixed default ref values --- .github/workflows/bundle-desktop-intel.yml | 5 +++-- .github/workflows/bundle-desktop-linux.yml | 2 +- .github/workflows/bundle-desktop-windows.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bundle-desktop-intel.yml b/.github/workflows/bundle-desktop-intel.yml index b6b9d714338a..ee69ed7eb95f 100644 --- a/.github/workflows/bundle-desktop-intel.yml +++ b/.github/workflows/bundle-desktop-intel.yml @@ -24,7 +24,7 @@ on: ref: type: string required: false - default: 'refs/heads/main' + default: '' secrets: CERTIFICATE_OSX_APPLICATION: description: 'Certificate for macOS application signing' @@ -82,7 +82,8 @@ jobs: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: - ref: ${{ inputs.ref }} + # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior + ref: ${{ inputs.ref != '' && inputs.ref || '' }} fetch-depth: 0 # Update versions before build diff --git a/.github/workflows/bundle-desktop-linux.yml b/.github/workflows/bundle-desktop-linux.yml index aec15e69c0f4..f13a15de8846 100644 --- a/.github/workflows/bundle-desktop-linux.yml +++ b/.github/workflows/bundle-desktop-linux.yml @@ -14,7 +14,7 @@ on: ref: type: string required: false - default: 'refs/heads/main' + default: '' name: "Bundle Desktop (Linux)" diff --git a/.github/workflows/bundle-desktop-windows.yml b/.github/workflows/bundle-desktop-windows.yml index bcb9fbe0a8c1..6dd21d93102a 100644 --- a/.github/workflows/bundle-desktop-windows.yml +++ b/.github/workflows/bundle-desktop-windows.yml @@ -20,7 +20,7 @@ on: description: 'Git ref to checkout' required: false type: string - default: 'refs/heads/main' + default: '' secrets: WINDOWS_CODESIGN_CERTIFICATE: required: false From be5b353a7ab759384c79ac07a46bbb2470cae996 Mon Sep 17 00:00:00 2001 From: Max Novich Date: Mon, 14 Jul 2025 10:56:08 -0700 Subject: [PATCH 3/3] drop ternary --- .github/workflows/bundle-desktop-intel.yml | 3 +-- .github/workflows/bundle-desktop-linux.yml | 3 +-- .github/workflows/bundle-desktop-windows.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bundle-desktop-intel.yml b/.github/workflows/bundle-desktop-intel.yml index ee69ed7eb95f..ab8208d2d812 100644 --- a/.github/workflows/bundle-desktop-intel.yml +++ b/.github/workflows/bundle-desktop-intel.yml @@ -82,8 +82,7 @@ jobs: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: - # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior - ref: ${{ inputs.ref != '' && inputs.ref || '' }} + ref: ${{ inputs.ref }} fetch-depth: 0 # Update versions before build diff --git a/.github/workflows/bundle-desktop-linux.yml b/.github/workflows/bundle-desktop-linux.yml index f13a15de8846..7bf7a45d80de 100644 --- a/.github/workflows/bundle-desktop-linux.yml +++ b/.github/workflows/bundle-desktop-linux.yml @@ -28,8 +28,7 @@ jobs: - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4 with: - # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior - ref: ${{ inputs.ref != '' && inputs.ref || '' }} + ref: ${{ inputs.ref }} fetch-depth: 0 # 2) Update versions before build diff --git a/.github/workflows/bundle-desktop-windows.yml b/.github/workflows/bundle-desktop-windows.yml index 6dd21d93102a..29877fea1dd4 100644 --- a/.github/workflows/bundle-desktop-windows.yml +++ b/.github/workflows/bundle-desktop-windows.yml @@ -45,8 +45,7 @@ jobs: - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4 with: - # Only pass ref if it's explicitly set, otherwise let checkout action use its default behavior - ref: ${{ inputs.ref != '' && inputs.ref || '' }} + ref: ${{ inputs.ref }} fetch-depth: 0 # 2) Configure AWS credentials for code signing