This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1f745bf publish documentation
1f745bf is described below
commit 1f745bf114b03fba4c2fde75b9a28d8dd8bed7b8
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Dec 25 16:02:01 2022 +0000
publish documentation
---
main/_sources/development/releasing.rst.txt | 10 +++++-----
main/development/releasing.html | 12 ++++++------
main/searchindex.js | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/main/_sources/development/releasing.rst.txt
b/main/_sources/development/releasing.rst.txt
index bf1fb42..637d711 100644
--- a/main/_sources/development/releasing.rst.txt
+++ b/main/_sources/development/releasing.rst.txt
@@ -113,12 +113,12 @@ Create or update the corresponding maintenance branch
.. code-block::
- # First cherry-pick any commits by hand.
git switch maint-X.Y.Z
+ # Remove the commits that created the changelog and bumped the
+ # versions, since 01-source.sh will redo those steps
+ git reset --hard HEAD~2
+ # Cherry-pick any commits by hand.
git cherry-pick ...
- # Revert the commit that created the changelog so we can
- # regenerate it in 01-source.sh
- git revert <CHANGELOG COMMIT>
# Push the updated maintenance branch to the remote repository
git push -u apache maint-X.Y.Z
@@ -139,7 +139,7 @@ Create the Release Candidate tag from the updated
maintenance branch
dev/release/01-prepare.sh <version> <next-version> <rc-number>
- git push -u apache apache-arrow-adbc-<version>-rc<rc-number>
+ git push -u apache apache-arrow-adbc-<version>-rc<rc-number> maint-<version>
Build source and binaries and submit them
-----------------------------------------
diff --git a/main/development/releasing.html b/main/development/releasing.html
index e8e5cb7..f85fb3c 100644
--- a/main/development/releasing.html
+++ b/main/development/releasing.html
@@ -398,12 +398,12 @@ Initial Release Candidate</label><div
class="sd-tab-content docutils">
<input id="sd-tab-item-1" name="sd-tab-set-0" type="radio">
</input><label class="sd-tab-label" for="sd-tab-item-1">
Follow up Release Candidates</label><div class="sd-tab-content docutils">
-<div class="highlight-default notranslate"><div
class="highlight"><pre><span></span><span class="c1"># First cherry-pick any
commits by hand.</span>
-<span class="n">git</span> <span class="n">switch</span> <span
class="n">maint</span><span class="o">-</span><span class="n">X</span><span
class="o">.</span><span class="n">Y</span><span class="o">.</span><span
class="n">Z</span>
+<div class="highlight-default notranslate"><div
class="highlight"><pre><span></span><span class="n">git</span> <span
class="n">switch</span> <span class="n">maint</span><span
class="o">-</span><span class="n">X</span><span class="o">.</span><span
class="n">Y</span><span class="o">.</span><span class="n">Z</span>
+<span class="c1"># Remove the commits that created the changelog and bumped
the</span>
+<span class="c1"># versions, since 01-source.sh will redo those steps</span>
+<span class="n">git</span> <span class="n">reset</span> <span
class="o">--</span><span class="n">hard</span> <span class="n">HEAD</span><span
class="o">~</span><span class="mi">2</span>
+<span class="c1"># Cherry-pick any commits by hand.</span>
<span class="n">git</span> <span class="n">cherry</span><span
class="o">-</span><span class="n">pick</span> <span class="o">...</span>
-<span class="c1"># Revert the commit that created the changelog so we
can</span>
-<span class="c1"># regenerate it in 01-source.sh</span>
-<span class="n">git</span> <span class="n">revert</span> <span
class="o"><</span><span class="n">CHANGELOG</span> <span
class="n">COMMIT</span><span class="o">></span>
<span class="c1"># Push the updated maintenance branch to the remote
repository</span>
<span class="n">git</span> <span class="n">push</span> <span
class="o">-</span><span class="n">u</span> <span class="n">apache</span> <span
class="n">maint</span><span class="o">-</span><span class="n">X</span><span
class="o">.</span><span class="n">Y</span><span class="o">.</span><span
class="n">Z</span>
</pre></div>
@@ -425,7 +425,7 @@ Follow up Release Candidates</label><div
class="sd-tab-content docutils">
<span class="n">dev</span><span class="o">/</span><span
class="n">release</span><span class="o">/</span><span class="mi">01</span><span
class="o">-</span><span class="n">prepare</span><span class="o">.</span><span
class="n">sh</span> <span class="o"><</span><span
class="n">version</span><span class="o">></span> <span
class="o"><</span><span class="nb">next</span><span class="o">-</span><span
class="n">version</span><span class="o">></span> <span
class="o"><</span><span cla [...]
-<span class="n">git</span> <span class="n">push</span> <span
class="o">-</span><span class="n">u</span> <span class="n">apache</span> <span
class="n">apache</span><span class="o">-</span><span
class="n">arrow</span><span class="o">-</span><span class="n">adbc</span><span
class="o">-<</span><span class="n">version</span><span
class="o">>-</span><span class="n">rc</span><span class="o"><</span><span
class="n">rc</span><span class="o">-</span><span class="n">number</span><span
clas [...]
+<span class="n">git</span> <span class="n">push</span> <span
class="o">-</span><span class="n">u</span> <span class="n">apache</span> <span
class="n">apache</span><span class="o">-</span><span
class="n">arrow</span><span class="o">-</span><span class="n">adbc</span><span
class="o">-<</span><span class="n">version</span><span
class="o">>-</span><span class="n">rc</span><span class="o"><</span><span
class="n">rc</span><span class="o">-</span><span class="n">number</span><span
clas [...]
</pre></div>
</div>
</section>
diff --git a/main/searchindex.js b/main/searchindex.js
index 651ff1c..125b40a 100644
--- a/main/searchindex.js
+++ b/main/searchindex.js
@@ -1 +1 @@
-Search.setIndex({"docnames": ["cpp/api/adbc", "cpp/api/adbc_driver_manager",
"cpp/api/index", "cpp/concurrency", "cpp/driver_manager", "cpp/index",
"development/contributing", "development/nightly", "development/releasing",
"driver/cpp/features", "driver/cpp/flight_sql", "driver/cpp/index",
"driver/cpp/postgresql", "driver/cpp/sqlite", "driver/java/flight_sql",
"driver/java/index", "driver/java/jdbc", "format/comparison",
"format/specification", "format/versioning", "go/index", "index", [...]
\ No newline at end of file
+Search.setIndex({"docnames": ["cpp/api/adbc", "cpp/api/adbc_driver_manager",
"cpp/api/index", "cpp/concurrency", "cpp/driver_manager", "cpp/index",
"development/contributing", "development/nightly", "development/releasing",
"driver/cpp/features", "driver/cpp/flight_sql", "driver/cpp/index",
"driver/cpp/postgresql", "driver/cpp/sqlite", "driver/java/flight_sql",
"driver/java/index", "driver/java/jdbc", "format/comparison",
"format/specification", "format/versioning", "go/index", "index", [...]
\ No newline at end of file
