Skip to content

Commit

Permalink
Merge branch 'branch2022' of https://github.com/TeX-Live/texlive-source
Browse files Browse the repository at this point in the history
… into trunk
  • Loading branch information
N-Holzschuch committed Apr 25, 2022
2 parents cc77ace + 30719dc commit 45a03d6
Show file tree
Hide file tree
Showing 5,262 changed files with 1,028,381 additions and 371,699 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
135 changes: 110 additions & 25 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,116 @@
# .github/workflows/main.yml for texlive-source CI building
#
# Norbert Preining
# Public Domain
#
# This file controls CI testing via Github Actions of the
# git-svn checkout of the TeX Live source directory
# which is pushed to Github
# 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
#
# To make and retrieve new binaries:
# * go to https://github.com/TeX-Live/texlive-source/commits/master
# and check that all commits you want are there (max waiting time 30min).
# * go to https://github.com/TeX-Live/texlive-source/releases
# and "Draft new release" (does git tag).
# * wait 30min or so.
# * go to https://github.com/TeX-Live/texlive-source/releases/latest/
# and there should be binaries for the new "release".
# * use tl-update-bindir.
#
# The actual code for building and running is in the Github Action
# TeX-Live/tl-build-docker-action
#
# TODO
# * it would be nice if we could adjust the docker action usage
# to override the dockerfile but this seems not to be possible at the moment

name: CI
on: [push]

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the trunk branch
push:
branches: [ trunk ]
pull_request:
branches: [ trunk ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-16.04
env:
TL_MAKE_FLAGS: -j 2
docker_linux_32bit_job:
runs-on: ubuntu-latest
name: i386-linux build job
steps:
- name: checkout
uses: actions/checkout@v2
- name: checkout
uses: actions/checkout@v2
with:
repository: TeX-Live/tl-build-docker-action
ref: v4
path: actions/TeX-Live/tl-build-docker-action
- name: Update Dockerfile
run: cp actions/TeX-Live/tl-build-docker-action/Dockerfile.i386-linux actions/TeX-Live/tl-build-docker-action/Dockerfile
- name: Run docker image
uses: ./actions/TeX-Live/tl-build-docker-action
with:
arch: 'i386-linux'
- name: find file step
run: ls -l
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: texlive-bin-i386-linux.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
docker_linux_64bit_job:
runs-on: ubuntu-latest
name: x86_64-linux build job
steps:
- name: checkout
uses: actions/checkout@v2
- name: checkout
uses: actions/checkout@v2
with:
repository: TeX-Live/tl-build-docker-action
ref: v4
path: actions/TeX-Live/tl-build-docker-action
- name: Update Dockerfile
run: cp actions/TeX-Live/tl-build-docker-action/Dockerfile.x86_64-linux actions/TeX-Live/tl-build-docker-action/Dockerfile
- name: Run docker image
uses: ./actions/TeX-Live/tl-build-docker-action
with:
arch: 'x86_64-linux'
- name: find file step
run: ls -l
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: texlive-bin-x86_64-linux.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
docker_linuxmusl_64bit_job:
runs-on: ubuntu-latest
name: x86_64-linuxmusl build job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Full build
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends bash gcc g++ make perl libfontconfig-dev libx11-dev libxmu-dev libxaw7-dev build-essential
cd $GITHUB_WORKSPACE ; ./Build -C
- name: checkout
uses: actions/checkout@v2
- name: checkout
uses: actions/checkout@v2
with:
repository: TeX-Live/tl-build-docker-action
ref: v4
path: actions/TeX-Live/tl-build-docker-action
- name: Update Dockerfile
run: cp actions/TeX-Live/tl-build-docker-action/Dockerfile.x86_64-linuxmusl actions/TeX-Live/tl-build-docker-action/Dockerfile
- name: Run docker image
uses: ./actions/TeX-Live/tl-build-docker-action
with:
arch: 'x86_64-linuxmusl'
- name: find file step
run: ls -l
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: texlive-bin-x86_64-linuxmusl.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

124 changes: 0 additions & 124 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions Build
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ export MAKE; export TL_MAKE

if test "x$1" = x--no-clean; then
shift
echo "$0: --no-clean given, so keeping build and install dirs: " \
"$TL_WORKDIR $TL_INSTALL_DEST"
else
test -f Makefile && $MAKE clean
rm -rf $TL_WORKDIR $TL_INSTALL_DEST
Expand Down
18 changes: 18 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
2022-03-21 Karl Berry <[email protected]>

* tardate.ac (tex_live_tardate): 2020-03-21 for TL'22.

2022-01-18 Karl Berry <[email protected]>

* version.ac: 2022, no more /dev.

2021-10-04 Karl Berry <[email protected]>

* reautoconf with automake-1.16.5.

2021-06-27 Karl Berry <[email protected]>

* reautoconf: pass -Wno-obsolete by default, since Autoconf 2.70
and later obsoletes many common macros. See m4/README for more.
Also standardize shell usage, etc., but no other functional changes.

2021-04-17 Karl Berry <[email protected]>

* version.ac: now 2022/dev since TL'21 is released.
Expand Down
31 changes: 8 additions & 23 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.3 from Makefile.am.
# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# Copyright (C) 1994-2021 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -274,9 +274,6 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/am/dist_hook.am \
$(srcdir)/am/recurse.am $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
Expand Down Expand Up @@ -345,6 +342,8 @@ CFLAGS = @CFLAGS@
CONF_SUBDIRS = @CONF_SUBDIRS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSCOPE = @CSCOPE@
CTAGS = @CTAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Expand All @@ -359,6 +358,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FT2_CONFIG = @FT2_CONFIG@
Expand Down Expand Up @@ -456,6 +456,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
Expand Down Expand Up @@ -493,23 +494,6 @@ SUBDIRS = . doc $(MAKE_SUBDIRS) libs utils texk
DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk
recurse_this =
recurse_top =

# am/recurse.am: Makefile fragment to configure and build subdirs.
#
# Copyright 2017-2020 Karl Berry <[email protected]>
# Copyright 2013 Peter Breitenlohner <[email protected]>
# You may freely use, modify and/or distribute this file.
#
# Requires $(recurse_this) and $(recurse_top).
# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
#
# For subdirs not required for the current set of configure options
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
#
# Code inspired by automake's way to handle recursive targets.
#
cf_silent = $(cf_silent_@AM_V@)
cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
cf_silent_0 = --silent
Expand Down Expand Up @@ -678,7 +662,6 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

Expand Down Expand Up @@ -1044,6 +1027,8 @@ $(CONFIG_AUX):
@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1

# (end of recurse.am)

# This (world) is the default target for the ./Build script in TeX Live.
.PHONY: world
world: all
Expand Down
Loading

0 comments on commit 45a03d6

Please sign in to comment.