Skip to content

Commit bea1035

Browse files
authored
Set 2.6 to release mode (#27760)
Update version numbering in the codebase to reflect the official 2.6 release. Corresponding PR for previous release for reference: #27335 To be merged on 2.6 code freeze day, September 10. [reviewed by @jabraham17 and @arezaii, thanks!] Testing: - [x] manually checked everything matches the previous release's PR
2 parents 133c106 + 4c21f3f commit bea1035

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ set(CHPL_PREV_PATCH_VERSION 0)
4646

4747
# Flip this to 'true' when we're ready to roll out a release; then back
4848
# after branching
49-
set(CHPL_OFFICIAL_RELEASE false)
49+
set(CHPL_OFFICIAL_RELEASE true)
5050

5151
### END config.h version value setting - configured_prefix set below ###
5252

doc/rst/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def setup(app):
137137
html_context = {"chplversion":chplversion}
138138

139139
# The full version, including alpha/beta/rc tags.
140-
release = '2.6.0 (pre-release)'
140+
release = '2.6.0'
141141

142142
# General information about the project.
143143
project = u'Chapel Documentation'

doc/rst/language/archivedSpecs.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Documentation Archives
55

66
Online Documentation Archives
77
-----------------------------
8+
* `Chapel 2.5 <https://chapel-lang.org/docs/2.5/>`_
89
* `Chapel 2.4 <https://chapel-lang.org/docs/2.4/>`_
910
* `Chapel 2.3 <https://chapel-lang.org/docs/2.3/>`_
1011
* `Chapel 2.2 <https://chapel-lang.org/docs/2.2/>`_

doc/rst/usingchapel/QUICKSTART.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ featured version of Chapel from source, refer to
122122
packages you should have available to build and run Chapel.
123123

124124

125-
1) If you don't already have the Chapel 2.5 source release, see
125+
1) If you don't already have the Chapel 2.6 source release, see
126126
https://chapel-lang.org/download/
127127

128128

@@ -132,14 +132,14 @@ featured version of Chapel from source, refer to
132132

133133
.. code-block:: bash
134134
135-
tar xzf chapel-2.5.0.tar.gz
135+
tar xzf chapel-2.6.0.tar.gz
136136
137137
b. Make sure that you are in the directory that was created when
138138
unpacking the source release, for example:
139139

140140
.. code-block:: bash
141141
142-
cd chapel-2.5.0
142+
cd chapel-2.6.0
143143
144144
c. Set up your environment for Chapel's Quickstart mode.
145145
If you are using a shell other than ``bash`` or ``zsh``,

doc/rst/usingchapel/chplenv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CHPL_HOME
3737

3838
.. code-block:: sh
3939
40-
export CHPL_HOME=~/chapel-2.5.0
40+
export CHPL_HOME=~/chapel-2.6.0
4141
4242
.. note::
4343
This, and all other examples in the Chapel documentation, assumes you're

man/confchpl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
:Version: 2.6 pre-release
2+
:Version: 2.6
33
:Manual section: 1
44
:Title: \\fBchpl\\fP
55
:Subtitle: Compiler for the Chapel Programming Language

man/confchpldoc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
:Version: 2.6 pre-release
2+
:Version: 2.6
33
:Manual section: 1
44
:Title: \\fBchpldoc\\fP
55
:Subtitle: the Chapel Documentation Tool

test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ compiler=$3
55
echo -n `basename $compiler`
66
cat $CWD/../../../compflags/bradc/printstuff/version.goodstart
77
# During pre-release mode
8-
diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9-
{ echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
8+
# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9+
# { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
1010
# During release mode:
11-
# echo ""
11+
echo ""
1212

1313
# print Sphinx and chapeldomain versions
1414
python=$($CWD/../../../../util/config/find-python.sh)

test/compflags/bradc/printstuff/versionhelp.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ compiler=$3
55
echo -n `basename $compiler`
66
cat $CWD/version.goodstart
77
# During pre-release mode
8-
diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9-
{ echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
8+
# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9+
# { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
1010
# During release mode:
11-
# echo ""
11+
echo ""
1212

1313
if [ "$CHPL_LLVM" != "none" ]
1414
then

0 commit comments

Comments
 (0)