From 1e231100e95fdf8ccc8efa89b989c009dcc689bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= Date: Fri, 28 Jun 2024 13:00:48 +0200 Subject: [PATCH 1/4] add nightly build script --- .github/workflows/Nightly.yml | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/Nightly.yml diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml new file mode 100644 index 00000000..d3828657 --- /dev/null +++ b/.github/workflows/Nightly.yml @@ -0,0 +1,60 @@ +on: + push: + branches: + - main + paths: + - ".github/workflows/Nightly.yml" + - "vendor.py" +# workflow_dispatch: +# inputs: +# # Git ref of the duckdb repo +# duckdb-ref: +# required: true +# type: string + schedule: + - cron: "17 0 * * *" + +name: Vendor upstream DuckDB sources + +jobs: + vendor: + runs-on: ubuntu-latest + outputs: + sha: ${{ steps.commit.outputs.sha }} + + name: "Update vendored sources" + + steps: + - uses: actions/setup-python@v5 + with: + python-version: '3.10' + + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/checkout@v4 + with: + repository: duckdb/duckdb + path: .git/duckdb + fetch-depth: 0 + + - uses: ./.github/workflows/git-identity + + - name: Vendor sources + id: vendor + run: | + git pull --rebase + python vendor.py --duckdb .git/duckdb + rm -rf .git/duckdb + git push --dry-run + # Check if ahead of upstream branch + # If yes, set a step output + if [ $(git rev-list HEAD...origin/main --count) -gt 0 ]; then + # Avoid set-output, it's deprecated + echo "vendor=ok" >> "$GITHUB_OUTPUT" + fi + + - if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request' + run: | + git push -u origin HEAD \ No newline at end of file From 6f10d8ca0894e2a3bc617b252511781267365e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= Date: Fri, 28 Jun 2024 13:01:55 +0200 Subject: [PATCH 2/4] try this: --- .github/workflows/Nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml index d3828657..0bc61a28 100644 --- a/.github/workflows/Nightly.yml +++ b/.github/workflows/Nightly.yml @@ -1,7 +1,7 @@ on: push: - branches: - - main +# branches: +# - main paths: - ".github/workflows/Nightly.yml" - "vendor.py" From 15d6b6837f78a8af4510ab3d95600e501a99b969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= Date: Fri, 28 Jun 2024 13:04:10 +0200 Subject: [PATCH 3/4] don't have that action --- .github/workflows/Nightly.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml index 0bc61a28..ed78e851 100644 --- a/.github/workflows/Nightly.yml +++ b/.github/workflows/Nightly.yml @@ -39,8 +39,6 @@ jobs: path: .git/duckdb fetch-depth: 0 - - uses: ./.github/workflows/git-identity - - name: Vendor sources id: vendor run: | From 5f12830d85a39f3e4fec77aba1d594e5dc7d4f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= Date: Fri, 28 Jun 2024 13:06:15 +0200 Subject: [PATCH 4/4] ok lets just try --- .github/workflows/Nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml index ed78e851..9d0145f4 100644 --- a/.github/workflows/Nightly.yml +++ b/.github/workflows/Nightly.yml @@ -1,7 +1,7 @@ on: push: -# branches: -# - main + branches: + - main paths: - ".github/workflows/Nightly.yml" - "vendor.py"