Merge pull request #721 from libexpat/issue-698-resolve-some-travis-leftovers

CI: Resolve some Travis CI leftovers (fixes #698)

.ci.sh

@@ -33,13 +33,16 @@
 
 set -e
 
-if [[ ${TRAVIS_OS_NAME} = osx ]]; then
+if [[ ${RUNNER_OS} = macOS ]]; then
     latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"
     export PATH="${latest_brew_python3_bin}${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
-elif [[ ${TRAVIS_OS_NAME} = linux ]]; then
+elif [[ ${RUNNER_OS} = Linux ]]; then
     export PATH="/usr/lib/llvm-15/bin:${PATH}"
+else
+    echo "Unsupported RUNNER_OS \"${RUNNER_OS}\"." >&2
+    exit 1
 fi
 
 echo "New \${PATH}:"

.github/workflows/coverage.yml

@@ -79,9 +79,8 @@ jobs:
     - name: Collect test coverage
       env:
         MODE: coverage-sh
-        TRAVIS_OS_NAME: linux
       run: |
-        exec ./.travis.sh
+        exec ./.ci.sh
 
     - name: Store coverage .info and HTML report
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce  # v3.1.2

.github/workflows/linux.yml

@@ -27,7 +27,7 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-name: Run Linux Travis CI tasks
+name: Run Linux CI tasks
 
 on:
   pull_request:
@@ -117,7 +117,7 @@ jobs:
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-15 main"
         sudo apt-get update  # due to new repository
-        # NOTE: Please note the version-specific ${PATH} extension for Clang in .travis.sh
+        # NOTE: Please note the version-specific ${PATH} extension for Clang in .ci.sh
         sudo apt-get install --yes --no-install-recommends -V \
             clang-15 \
             clang-format-15 \
@@ -137,6 +137,5 @@ jobs:
     - name: Perform check "${{ matrix.MODE }}"
       env:
         MODE: ${{ matrix.MODE }}
-        TRAVIS_OS_NAME: linux
       run: |
-        env ${{ matrix.FLAT_ENV }} ./.travis.sh
+        env ${{ matrix.FLAT_ENV }} ./.ci.sh

.github/workflows/macos.yml

@@ -27,7 +27,7 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-name: Run macOS Travis CI tasks
+name: Run macOS CI tasks
 
 on:
   pull_request:
@@ -61,6 +61,5 @@ jobs:
     - name: Perform check "${{ matrix.MODE }}"
       env:
         MODE: ${{ matrix.MODE }}
-        TRAVIS_OS_NAME: osx
       run: |
-        env ${{ matrix.FLAT_ENV }} ./.travis.sh
+        env ${{ matrix.FLAT_ENV }} ./.ci.sh

expat/Changes

@@ -7,6 +7,9 @@ Release 2.5.1 xxx xxxxxxx xx xxxx
             #673  examples: Add new example "element_declarations.c"
             #678  Autotools: Sync CMake templates with CMake 3.23
 
+        Infrastructure:
+       #698 #721  CI: Resolve some Travis CI leftovers
+
 Release 2.5.0 Tue October 25 2022
         Security fixes:
   #616 #649 #650  CVE-2022-43680 -- Fix heap use-after-free after overeager

expat/README.md

@@ -1,4 +1,4 @@
-[![Run Linux Travis CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml)
+[![Run Linux CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/libexpat/libexpat?svg=true)](https://ci.appveyor.com/project/libexpat/libexpat)
 [![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions)
 [![Downloads SourceForge](https://img.shields.io/sourceforge/dt/expat?label=Downloads%20SourceForge)](https://sourceforge.net/projects/expat/files/)