From 8d36f5966675e23bee7026ba37ae0647fbf47300 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 Apr 2024 10:11:53 +0200
Subject: Merging upstream version 23.7.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/ISSUE_TEMPLATE/bug_report.md |  5 ++-
 .github/workflows/python-publish.yml | 85 ++++++++++++++++++------------------
 2 files changed, 46 insertions(+), 44 deletions(-)

(limited to '.github')

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3884dc0..38bb280 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,8 +8,9 @@ assignees: ''
 ---
 
 **Before you file an issue**
-- Make sure you specify the "read" dialect eg. parse_one(sql, read="spark")
-- Check if the issue still exists on main 
+- Make sure you specify the "read" dialect eg. `parse_one(sql, read="spark")`
+- Make sure you specify the "write" dialect eg. `ast.sql(dialect="duckdb")`
+- Check if the issue still exists on main
 
 **Fully reproducible code snippet**
 Please include a fully reproducible code snippet or the input sql, dialect, and expected output.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index fdba150..3c89a4b 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -9,6 +9,47 @@ permissions:
   contents: read
 
 jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m venv .venv
+        source ./.venv/bin/activate
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+        make install-dev
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+      run: |
+        source ./.venv/bin/activate
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
+    - name: Update API docs
+      run: |
+        source ./.venv/bin/activate
+        make docs
+    - name: Update CHANGELOG
+      id: changelog
+      uses: requarks/changelog-action@v1
+      with:
+        token: ${{ github.token }}
+        tag: ${{ github.ref_name }}
+    - name: Commit API docs, CHANGELOG.md
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        branch: main
+        commit_message: 'docs: update API docs, CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
+        file_pattern: 'docs CHANGELOG.md'
   build-rs:
     strategy:
       matrix:
@@ -30,6 +71,7 @@ jobs:
         - os: windows
           target: aarch64
     runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
+    needs: [deploy]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
@@ -52,6 +94,7 @@ jobs:
 
   sdist-rs:
     runs-on: ubuntu-latest
+    needs: [deploy]
     steps:
     - uses: actions/checkout@v3
     - name: Build sdist
@@ -80,45 +123,3 @@ jobs:
       with:
         command: upload
         args: --non-interactive --skip-existing *
-
-  deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m venv .venv
-        source ./.venv/bin/activate
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-        make install-dev
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: |
-        source ./.venv/bin/activate
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
-    - name: Update API docs
-      run: |
-        source ./.venv/bin/activate
-        make docs
-    - name: Update CHANGELOG
-      id: changelog
-      uses: requarks/changelog-action@v1
-      with:
-        token: ${{ github.token }}
-        tag: ${{ github.ref_name }}
-    - name: Commit API docs, CHANGELOG.md
-      uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        branch: main
-        commit_message: 'docs: update API docs, CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
-        file_pattern: 'docs CHANGELOG.md'
-- 
cgit v1.2.3