Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rinutils for openSUSE:Factory checked in at 2022-08-13 22:36:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rinutils (Old) and /work/SRC/openSUSE:Factory/.rinutils.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rinutils" Sat Aug 13 22:36:59 2022 rev:4 rq:994878 version:0.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rinutils/rinutils.changes 2021-12-22 20:19:02.927874672 +0100 +++ /work/SRC/openSUSE:Factory/.rinutils.new.1521/rinutils.changes 2022-08-13 22:36:59.974695218 +0200 @@ -1,0 +2,6 @@ +Fri Aug 12 21:05:49 UTC 2022 - Dirk M??ller <[email protected]> + +- update to 0.10.1: + * Fix "pkg-config file is broken when CMAKE_INSTALL_INCLUDEDIR is absolute" + +------------------------------------------------------------------- Old: ---- rinutils-0.10.0.tar.xz New: ---- rinutils-0.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rinutils.spec ++++++ --- /var/tmp/diff_new_pack.cyKrxq/_old 2022-08-13 22:37:01.006697827 +0200 +++ /var/tmp/diff_new_pack.cyKrxq/_new 2022-08-13 22:37:01.014697848 +0200 @@ -1,7 +1,7 @@ # # spec file for package rinutils # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: rinutils -Version: 0.10.0 +Version: 0.10.1 Release: 0 Summary: Shlomi Fish's gnu11 C Library of Random headers License: MIT ++++++ rinutils-0.10.0.tar.xz -> rinutils-0.10.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/.act-github/workflows/use-github-actions.yml new/rinutils-0.10.1/.act-github/workflows/use-github-actions.yml --- old/rinutils-0.10.0/.act-github/workflows/use-github-actions.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/rinutils-0.10.1/.act-github/workflows/use-github-actions.yml 2021-11-07 09:03:12.000000000 +0100 @@ -0,0 +1,28 @@ +jobs: + test-fc-solve: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get update -qq + - run: sudo apt-get --no-install-recommends install -y eatmydata + - run: sudo eatmydata apt-get --no-install-recommends install -y build-essential + cmake cmake-data cpanminus libcmocka-dev libperl-dev ninja-build perl + valgrind xz-utils zip + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; cpanm local::lib + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; eval "$(perl -Mlocal::lib=$HOME/perl_modules)" + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; which python3 + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; cpanm --notest Code::TidyAll::Plugin::TestCount + Dir::Manifest Env::Path IO::All Inline Inline::C Perl::Critic Perl::Tidy + Test::Code::TidyAll Test::Differences Test::Pod Test::Pod::Coverage + Test::RunValgrind Test::TrailingSpace Test::Trap + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; _verbose() { export HARNESS_VERBOSE=1 ; } ; export + FCS_TEST_BUILD=1 RINUTILS_TEST_TIDY=1 RINUTILS_TEST_BUILD=1 ; perl + CI-testing/continuous-integration-testing.pl +name: use-github-actions +'on': +- push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/.github/workflows/use-github-actions.yml new/rinutils-0.10.1/.github/workflows/use-github-actions.yml --- old/rinutils-0.10.0/.github/workflows/use-github-actions.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/rinutils-0.10.1/.github/workflows/use-github-actions.yml 2021-11-07 09:03:12.000000000 +0100 @@ -0,0 +1,28 @@ +jobs: + test-fc-solve: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get update -qq + - run: sudo apt-get --no-install-recommends install -y eatmydata + - run: sudo eatmydata apt-get --no-install-recommends install -y build-essential + cmake cmake-data cpanminus libcmocka-dev libperl-dev ninja-build perl + valgrind xz-utils zip + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; cpanm local::lib + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; eval "$(perl -Mlocal::lib=$HOME/perl_modules)" + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; which python3 + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; cpanm --notest Code::TidyAll::Plugin::TestCount + Dir::Manifest Env::Path IO::All Inline Inline::C Perl::Critic Perl::Tidy + Test::Code::TidyAll Test::Differences Test::Pod Test::Pod::Coverage + Test::RunValgrind Test::TrailingSpace Test::Trap + - run: local_lib_shim() { eval "$(perl -Mlocal::lib=$HOME/perl_modules)"; + } ; local_lib_shim ; _verbose() { export HARNESS_VERBOSE=1 ; } ; export + FCS_TEST_BUILD=1 RINUTILS_TEST_TIDY=1 RINUTILS_TEST_BUILD=1 ; perl + CI-testing/continuous-integration-testing.pl +name: use-github-actions +'on': +- push diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/CI-testing/continuous-integration-testing.pl new/rinutils-0.10.1/CI-testing/continuous-integration-testing.pl --- old/rinutils-0.10.0/CI-testing/continuous-integration-testing.pl 2020-09-29 19:01:43.000000000 +0200 +++ new/rinutils-0.10.1/CI-testing/continuous-integration-testing.pl 2022-05-19 05:48:15.000000000 +0200 @@ -28,7 +28,7 @@ GetOptions( 'gen=s' => \$cmake_gen, ) or die 'Wrong options'; -local $ENV{RUN_TESTS_VERBOSE} = 1; +local $ENV{RUN_TESTS_VERBOSE} = ( $ENV{RUN_TESTS_VERBOSE} // 1 ); if ( defined $cmake_gen ) { $ENV{CMAKE_GEN} = $cmake_gen; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/CI-testing/translate-travis.yml-to-github-actions.py new/rinutils-0.10.1/CI-testing/translate-travis.yml-to-github-actions.py --- old/rinutils-0.10.0/CI-testing/translate-travis.yml-to-github-actions.py 1970-01-01 01:00:00.000000000 +0100 +++ new/rinutils-0.10.1/CI-testing/translate-travis.yml-to-github-actions.py 2021-11-07 09:02:32.000000000 +0100 @@ -0,0 +1,122 @@ +#! /usr/bin/env python3 +# -*- coding: utf-8 -*- +# vim:fenc=utf-8 +# +# Copyright ?? 2021 Shlomi Fish < https://www.shlomifish.org/ > +# +# Licensed under the terms of the MIT license. + +""" +fc-solve/CI-testing/translate-travis.yml-to-github-actions.py : + +This program translates fc-solve's .travis.yml to GitHub actions +and ACT workflows ( https://github.com/nektos/act ). + +While ostensibly FOSS, it most probably is not generic enough +for your use cases. + +""" + +import re + +import yaml + + +def _add_condition_while_excluding_gh_actions(job_dict, is_act): + """ + See: + + https://github.com/actions/runner/issues/480 + + Workflow level `env` does not work properly in all fields. ?? Issue #480 + + """ + if is_act: + job_dict['if'] = \ + "${{ ! contains(env.ACT_SKIP, matrix.env.WHAT) }}" + + +def generate(output_path, is_act): + """docstring for main""" + env_keys = set() + + def _process_env(env): + ret = {} + for line in env: + m = re.match( + '\\A([A-Za-z0-9_]+)=([A-Za-z0-9_]+)\\Z', + line) + key = m.group(1) + val = m.group(2) + assert key not in ret + ret[key] = val + env_keys.add(key) + return ret + with open("./.travis.yml", "rt") as infh: + data = yaml.safe_load(infh) + steps = [] + steps.append({"uses": ("actions/checkout@v2"), }) + if 0: + steps.append({ + "run": + ("cd workflow ; (ls -lrtA ; false)"), }) + elif 0: + steps.append({ + "run": + ("cd . ; (ls -lrtA ; false)"), }) + steps.append({"run": ("sudo apt-get update -qq"), }) + steps.append({ + "run": ("sudo apt-get --no-install-recommends install -y " + + " ".join(["eatmydata"]) + ), + } + ) + steps.append({ + "run": ("sudo eatmydata apt-get --no-install-recommends install -y " + + " ".join(data['addons']['apt']['packages']) + ), + } + ) + local_lib_shim = 'local_lib_shim() { eval "$(perl ' + \ + '-Mlocal::lib=$HOME/' + \ + 'perl_modules)"; } ; local_lib_shim ; ' + for arr in ['before_install', 'install', 'script']: + steps += [{"run": local_lib_shim + x} for x in data[arr]] + job = 'test-fc-solve' + o = {'jobs': {job: {'runs-on': 'ubuntu-latest', + 'steps': steps, }}, + 'name': 'use-github-actions', 'on': ['push', ], } + if 'matrix' in data: + if 'include' in data['matrix']: + o['jobs'][job]['strategy'] = {'matrix': {'include': [ + {'env': _process_env(x['env']), } + for x in data['matrix']['include'] + ], }, } + o['jobs'][job]['env'] = { + x: "${{ matrix.env." + x + " }}" + for x in env_keys + } + _add_condition_while_excluding_gh_actions( + job_dict=o['jobs'][job], + is_act=is_act, + ) + else: + assert False + with open(output_path, "wt") as outfh: + # yaml.safe_dump(o, outfh) + yaml.safe_dump(o, stream=outfh, canonical=False, indent=4, ) + + +def main(): + generate( + output_path=".github/workflows/use-github-actions.yml", + is_act=False, + ) + generate( + output_path=".act-github/workflows/use-github-actions.yml", + is_act=True, + ) + + +if __name__ == "__main__": + main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/CMakeLists.txt new/rinutils-0.10.1/CMakeLists.txt --- old/rinutils-0.10.0/CMakeLists.txt 2021-09-06 08:15:23.000000000 +0200 +++ new/rinutils-0.10.1/CMakeLists.txt 2022-05-19 05:25:45.000000000 +0200 @@ -3,6 +3,7 @@ INCLUDE ("${CMAKE_SOURCE_DIR}/cmake/shlomif_common_bootstrap.cmake") SHLOMIF_COMMON_SETUP("${private_mod_path}") +INCLUDE ("${CMAKE_SOURCE_DIR}/cmake/JoinPaths.cmake") CMAKE_POLICY(SET CMP0054 NEW) option (WITH_TEST_SUITE "Also build and run the test suite.") @@ -118,6 +119,8 @@ "${RINUTILS_INSTALL_MYLIBDIR}/pkgconfig" ) +join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${CPACK_PACKAGE_NAME}.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/${CPACK_PACKAGE_NAME}.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/NEWS.asciidoc new/rinutils-0.10.1/NEWS.asciidoc --- old/rinutils-0.10.0/NEWS.asciidoc 2021-09-06 08:17:46.000000000 +0200 +++ new/rinutils-0.10.1/NEWS.asciidoc 2022-05-19 05:39:09.000000000 +0200 @@ -1,9 +1,15 @@ rinutils' News File =================== Shlomi Fish <[email protected]> -:Date: 2019-11-17 +:Date: 2022-05-19 :Revision: $Id$ +0.10.1 ( 19 May 2022 ) +---------------------------- + +* Add GitHub actions' CI. +* Fix https://github.com/shlomif/rinutils/issues/5 ( "pkg-config file is broken when CMAKE_INSTALL_INCLUDEDIR is absolute") + 0.10.0 ( 06 Sep 2021 ) ---------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/cmake/JoinPaths.cmake new/rinutils-0.10.1/cmake/JoinPaths.cmake --- old/rinutils-0.10.0/cmake/JoinPaths.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/rinutils-0.10.1/cmake/JoinPaths.cmake 2022-05-19 05:18:20.000000000 +0200 @@ -0,0 +1,23 @@ +# This module provides function for joining paths +# known from most languages +# +# SPDX-License-Identifier: (MIT OR CC0-1.0) +# Copyright 2020 Jan Tojnar +# https://github.com/jtojnar/cmake-snips +# +# Modelled after Python???s os.path.join +# https://docs.python.org/3.7/library/os.path.html#os.path.join +# Windows not supported +function(join_paths joined_path first_path_segment) + set(temp_path "${first_path_segment}") + foreach(current_segment IN LISTS ARGN) + if(NOT ("${current_segment}" STREQUAL "")) + if(IS_ABSOLUTE "${current_segment}") + set(temp_path "${current_segment}") + else() + set(temp_path "${temp_path}/${current_segment}") + endif() + endif() + endforeach() + set(${joined_path} "${temp_path}" PARENT_SCOPE) +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/librinutils.pc.in new/rinutils-0.10.1/librinutils.pc.in --- old/rinutils-0.10.0/librinutils.pc.in 2021-09-06 07:55:27.000000000 +0200 +++ new/rinutils-0.10.1/librinutils.pc.in 2022-05-19 05:25:55.000000000 +0200 @@ -1,7 +1,7 @@ prefix="@CMAKE_INSTALL_PREFIX@" exec_prefix=${prefix} libdir=${exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +includedir=@includedir_for_pc_file@ Name: rinutils Description: Ad hoc headers library for C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/rinutils.spec new/rinutils-0.10.1/rinutils.spec --- old/rinutils-0.10.0/rinutils.spec 2021-09-06 08:23:22.000000000 +0200 +++ new/rinutils-0.10.1/rinutils.spec 2022-05-19 05:59:18.000000000 +0200 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: rinutils -Version: 0.10.0 +Version: 0.10.1 Release: 1 License: MIT Group: Development/C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/run-tests.pl new/rinutils-0.10.1/run-tests.pl --- old/rinutils-0.10.0/run-tests.pl 2021-06-28 13:51:06.000000000 +0200 +++ new/rinutils-0.10.1/run-tests.pl 2022-05-19 05:45:00.000000000 +0200 @@ -35,6 +35,7 @@ } my $exit_success; +my $RUN_TESTS_VERBOSE = ( $ENV{RUN_TESTS_VERBOSE} // "" ); sub run_tests { @@ -48,7 +49,7 @@ '-v', grep { /build-proc/ || /\.py\z/ } @$tests ); } - if ( $ENV{RUN_TESTS_VERBOSE} ) + if ($RUN_TESTS_VERBOSE) { print "Running [@cmd]\n"; } @@ -188,11 +189,14 @@ @tests = grep { !/(?:cmpdigest|verify)--/ } @tests; } - print STDERR <<"EOF"; + if ($RUN_TESTS_VERBOSE) + { + print STDERR <<"EOF"; FCS_BIN_PATH = $ENV{FCS_BIN_PATH} FCS_SRC_PATH = $ENV{FCS_SRC_PATH} FCS_TEST_TAGS = <$ENV{FCS_TEST_TAGS}> EOF + } if ( $ENV{FCS_TEST_SHELL} ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rinutils-0.10.0/ver.txt new/rinutils-0.10.1/ver.txt --- old/rinutils-0.10.0/ver.txt 2021-09-06 08:12:37.000000000 +0200 +++ new/rinutils-0.10.1/ver.txt 2022-05-19 05:37:27.000000000 +0200 @@ -1 +1 @@ -0.10.0 +0.10.1
