diff --git a/SOURCES/gating.yaml b/SOURCES/gating.yaml deleted file mode 100644 index 7407443..0000000 --- a/SOURCES/gating.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional} diff --git a/SOURCES/plans/ci.fmf b/SOURCES/plans/ci.fmf deleted file mode 100644 index b6a344d..0000000 --- a/SOURCES/plans/ci.fmf +++ /dev/null @@ -1,13 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf - url: https://src.fedoraproject.org/tests/gcc.git - filter: 'tag: Fedora-CI-gating' -execute: - how: tmt -adjust: - - prepare+: - - name: Add secondary architecture RPMs - how: shell - script: ./plans/provide_secondary_arch_rpms.sh - when: arch == x86_64 diff --git a/SOURCES/plans/provide_secondary_arch_rpms.sh b/SOURCES/plans/provide_secondary_arch_rpms.sh deleted file mode 100755 index f26a5ab..0000000 --- a/SOURCES/plans/provide_secondary_arch_rpms.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env bash - -# Fedora CI testing systems don't provide a repository with the i686 -# RPMs of the build being tested. As a consequence, most -# dnf install -y .i686 -# commands (whether being run by a test or by TMT's prepare) will probably -# fail on a version mismatch with the present x86_64 gcc RPMs. To prevent -# such failures we provide this script which we recommend to include in every -# Fedora CI test plan. -# -# Implementation notes: -# -# * The gcc build being tested in Fedora CI is given via KOJI_TASK_ID. See -# https://github.com/fedora-ci/dist-git-pipeline/pull/50 for details. -# -# * Currently this script just downloads and installs the i686 RPMs. It -# would not be sufficient for tests that uninstall and reinstall those -# RPMs. If such a test appears, this script should create a repository. -# -# * Fedora CI testing systems seem to have extremely small RAM-based /tmp, -# unable to host all the downloaded RPMs, and no other "real" filesystem -# than "/". That's the reason for using -# mktemp -d --tmpdir=/ - -set -x - -true "V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V" - -echo "KOJI_TASK_ID=$KOJI_TASK_ID" - -. /etc/os-release - -echo "ID=$ID" -echo "arch=$(arch)" -echo "KOJI_TASK_ID=$KOJI_TASK_ID" - -if [[ "$ID" = fedora ]] && [[ "$(arch)" = x86_64 ]] && [[ -n "$KOJI_TASK_ID" ]]; then - - if tmpd=$(mktemp -d --tmpdir=/) && pushd "$tmpd"; then - - # Download - rpm -q koji || dnf -y install koji - koji download-task "$KOJI_TASK_ID" --noprogress --arch={x86_64,i686,noarch} - - # Remove conflicting RPMs - rm -f ./*debuginfo* ./*debugsource* - rm -f gcc-[0-9]*.i686.* - rm -f ./*docs*.i686.* - - # Install - ls - dnf -y install ./*.rpm - - # Clean up - # shellcheck disable=SC2164 - popd - rm -rf "$tmpd" - fi - -else - echo "Not applicable" -fi - -true "^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^" diff --git a/SPECS/gcc.spec b/SPECS/gcc.spec index d6b8524..d1c343d 100644 --- a/SPECS/gcc.spec +++ b/SPECS/gcc.spec @@ -143,7 +143,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist}.1 +Release: %{gcc_release}%{?dist}.1.alma.2 # License notes for some of the less obvious ones: # gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para # isl: MIT, BSD-2-Clause @@ -1011,7 +1011,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ --target nvptx-none --enable-as-accelerator-for=%{gcc_target_platform} \ --enable-languages=c,c++,fortran,lto \ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla \ + --with-bugurl=http://bugs.almalinux.org/ \ --enable-checking=release --with-system-zlib \ --with-gcc-major-version-only --without-isl make %{?_smp_mflags} @@ -1047,7 +1047,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ --target amdgcn-amdhsa --enable-as-accelerator-for=%{gcc_target_platform} \ --enable-languages=c,c++,fortran,lto \ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla \ + --with-bugurl=http://bugs.almalinux.org/ \ --enable-checking=release --with-system-zlib \ --with-gcc-major-version-only --without-isl --disable-libquadmath make %{?_smp_mflags} @@ -1116,7 +1116,7 @@ offloadtgts=${offloadtgts:+${offloadtgts},}amdgcn-amdhsa %endif CONFIGURE_OPTS="\ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla \ + --with-bugurl=http://bugs.almalinux.org/ \ --enable-shared --enable-threads=posix --enable-checking=release \ %ifarch ppc64le --enable-targets=powerpcle-linux \ @@ -3630,6 +3630,9 @@ end %endif %changelog +* Fri Aug 02 2024 Eduard Abdullin - 14.1.1-5.1.alma.2 +- Change to almalinux bugtracker + * Mon Jul 15 2024 Eduard Abdullin - 14.1.1-5.1.alma.1 - Disable multilib on x86_64_v2