summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-11 23:09:34 +0000
committerKarl Berry <karl@freefriends.org>2024-02-11 23:09:34 +0000
commit28be459803dd0bcd969b76f21388b6e574b4988f (patch)
treeb3edd0b62026199072c54cc135d25ad73eda75ab
parent04e1d22dd491c19ef94bfc1ab01718ca6a8e7a31 (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@69813 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/.github/workflows/main.yml10
-rw-r--r--Build/source/ChangeLog6
-rw-r--r--Build/source/README2
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm6
-rwxr-xr-x[-rw-r--r--]Master/bin/windows/ptekf.exebin40960 -> 40960 bytes
-rwxr-xr-xMaster/bin/windows/runscript.tlu6
-rw-r--r--Master/tlpkg/doc/releng.txt9
7 files changed, 21 insertions, 18 deletions
diff --git a/Build/source/.github/workflows/main.yml b/Build/source/.github/workflows/main.yml
index b29415c1622..ffc3096ea56 100644
--- a/Build/source/.github/workflows/main.yml
+++ b/Build/source/.github/workflows/main.yml
@@ -8,13 +8,19 @@
#
# This file controls CI testing via Github Actions of the
# git-svn checkout of the TeX Live source directory
-# which is pushed to Github
+# which is pushed to Github at:
# https://github.com/TeX-Live/texlive-source
+#
# The cron job that does the git svn up and git push is
# running on texlive.info; see norbert cron there. Run cmd as norbert:
# /home/norbert/git-svn-repos/git-svn-syncer --new texlive-source
#
-# See tlpkg/bin/tl-update-bindir for retrieving the binaries.
+# A build is started with every commit. If a commit happens while a
+# build is running, the build is cancelled and a new one started.
+#
+# See tlpkg/bin/tl-update-bindir for retrieving the binaries, which is
+# done only when a release is tagged, not from the
+# commit-triggered builds here.
# only build on push to trunk, not branch.
on:
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index ce49acbf8d7..80de5a62621 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,9 +1,3 @@
-2024-02-10 Karl Berry <karl@tug.org>
-
- * .github/workflows/main.yml: aarch64 and armhf are taking forever
- (1h50m and counting), try disabling. Also try disabling the
- build-on-push-to-trunk for the moment.
-
2023-12-31 Karl Berry <karl@freefriends.org>
* reautoconf: add -f / --force option to pass to autoreconf.
diff --git a/Build/source/README b/Build/source/README
index 62d47eb3939..e017451d296 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -56,7 +56,7 @@ i386-freebsd amd64-freebsd:
i386-linux: see travis below.
i386-netbsd, amd64-netbsd:
- NetBSD/amd64 9.2
+ NetBSD/amd64 9.3
gcc version 7.5.0 (nb4 20200810)
TL_MAKE=gmake CC=gcc CXX=g++ \
CFLAGS=-D_NETBSD_SOURCE \
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index c75aceab3ce..e6fa821d6cd 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,12 +1,12 @@
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2023 Norbert Preining
+# Copyright 2007-2024 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
use strict; use warnings;
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 66204 $';
+my $svnrev = '$Revision: 69783 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -61,7 +61,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-our $ReleaseYear = 2023;
+our $ReleaseYear = 2024;
# users can upgrade from this year to the current year; might be the
# same as the release year, or any number of releases earlier.
diff --git a/Master/bin/windows/ptekf.exe b/Master/bin/windows/ptekf.exe
index 195fc73ee2a..195fc73ee2a 100644..100755
--- a/Master/bin/windows/ptekf.exe
+++ b/Master/bin/windows/ptekf.exe
Binary files differ
diff --git a/Master/bin/windows/runscript.tlu b/Master/bin/windows/runscript.tlu
index 31ed7767d5d..d59e5d83df2 100755
--- a/Master/bin/windows/runscript.tlu
+++ b/Master/bin/windows/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 65362 $", "%d+") or "0"
-local svndate = string.match("$Date: 2022-12-27 04:12:37 +0900 (火, 27 12 2022) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision$", "%d+") or "0"
+local svndate = string.match("$Date$", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -275,7 +275,7 @@ local docstr = [[
- support cluttex scripts
2018/11/08
- use included tcltk interpreter
-
+ (see vc log for later changes)
]]
-- HELPER SUBROUTINES --
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index ce3375b1861..470d7836524 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -173,7 +173,9 @@ The complaints about unknown "svn status output line"s are ok.
It's likely that .tlpsrc files will need to be adjusted for new binaries.
When removing platforms, also have to remove from /home/texlive/trunk.
-8a. svn commit all the above.
+8a. After this is done, svn commit all the above.
+
+8b. Reset the cron.tl assignments made in step 2 above back to normal.
9. After the trial build goes ok, set up tlpretest:
cd /home/ftp/texlive/tlpretest
@@ -222,9 +224,10 @@ There will be no linked_scripts dir (no build done), but that's ok;
we won't be installing binaries from a build.
11. In cron.tl, set critical= , net_frozen=false, and
- return to regular catalogue_compare=true biweekly updates.
+ return to regular catalogue_compare=true biweekly updates, i.e.,
+ undo the step 2 settings (if not already done).
In the crontab, enable the pretest entries,
- and re-enable cron.synctl.
+ re-enable cron.synctl, review everything.
12. Life and daily updates resume: run c2a to update trunk->tlpretest,
c2b to update branch->tlnet. Of course, don't update the branch if a