Skip to content

Commit ce17a11

Browse files
committed
Remove debug job
1 parent fa79182 commit ce17a11

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

.github/workflows/Java.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ jobs:
301301

302302
java-merge-vendoring-pr:
303303
name: Merge vendoring PR
304-
if: ${{ github.repository == 'duckdb/duckdb-java' && github.event_name == 'pull_request' && startsWith(github.head_ref, 'vendoring-') }}
304+
if: ${{ github.repository == 'duckdb/duckdb-java' && github.event_name == 'pull_request' && github.head_ref == format('vendoring-{0}', github.base_ref) }}
305305
needs:
306306
- java-linux-aarch64
307307
- java-linux-amd64
@@ -319,7 +319,7 @@ jobs:
319319
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
320320
run: |
321321
echo "Merging PR number: ${{ github.event.pull_request.number }} with message: ${{ github.event.pull_request.title }}"
322-
gh pr merge vendoring-${{ github.ref_name }} \
322+
gh pr merge vendoring-${{ github.base_ref }} \
323323
--rebase \
324324
--subject "${{ github.event.pull_request.title }}" \
325325
--body ""
@@ -328,33 +328,9 @@ jobs:
328328
id: update_vendoring_branch
329329
if: ${{ steps.merge_vendoring_pr.outcome == 'success' }}
330330
run: |
331-
# Delete vendoring-${{ github.ref_name }} branch and re-create it for future PRs
332-
git push --delete origin vendoring-${{ github.ref_name }}
331+
# Delete vendoring-${{ github.base_ref }} branch and re-create it for future PRs
332+
git push --delete origin vendoring-${{ github.base_ref }}
333333
git checkout --track origin/main
334334
git pull --ff-only
335-
git branch vendoring-${{ github.ref_name }}
336-
git push origin vendoring-${{ github.ref_name }}
337-
338-
java-merge-vendoring-pr-debug:
339-
name: Merge vendoring PR Debug
340-
runs-on: ubuntu-latest
341-
steps:
342-
- uses: actions/checkout@v4
343-
with:
344-
fetch-depth: 0
345-
346-
- name: Merge vendoring PR Debug
347-
id: merge_vendoring_pr_debug
348-
env:
349-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
350-
run: |
351-
echo "github.repository: ${{ github.repository }}"
352-
echo "github.event_name: ${{ github.event_name }}"
353-
echo "github.head_ref: ${{ github.head_ref }}"
354-
echo "github.base_ref: ${{ github.base_ref }}"
355-
echo "github.ref_name: ${{ github.ref_name }}"
356-
echo "format('vendoring-{0}', github.ref_name): ${{ format('vendoring-{0}', github.ref_name) }}"
357-
echo "format('vendoring-{0}', github.base_ref): ${{ format('vendoring-{0}', github.base_ref) }}"
358-
echo "startsWith(github.head_ref, 'workflows_minor_'): ${{ startsWith(github.head_ref, 'vendoring-') }}"
359-
echo "github.event.pull_request.number: ${{ github.event.pull_request.number }}"
360-
echo "github.event.pull_request.title: ${{ github.event.pull_request.title }}"
335+
git branch vendoring-${{ github.base_ref }}
336+
git push origin vendoring-${{ github.base_ref }}

0 commit comments

Comments
 (0)