Merge branch 'master' into patch-3

AlmaLinux · Jul 27, 2023 · 49aadda · 49aadda
2 parents 93c6f1c + d459d71
commit 49aadda
Show file tree

Hide file tree

Showing 32 changed files with 409 additions and 152 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,12 +40,12 @@ jobs:
       - name: Check YAML configs
         run: |
           mirror_regexp="mirrors.d/.*.(yml|yaml)$"
-          if ! echo "${{ steps.files.outputs.all }}" | grep -E "${mirror_regexp}" &> /dev/null; then
-            # we check only the main config if PR doesn't contain any mirror config
+          if ! echo "${{ steps.files.outputs.added_modified }}" | grep -E "${mirror_regexp}" &> /dev/null; then
+            # we check only the main config if PR doesn't contain any new or modified mirror config
             python3.9 gh_ci/config_checker.py -sc config.yml
           else
             changed_files=""
-            for changed_file in ${{ steps.files.outputs.all }}; do
+            for changed_file in ${{ steps.files.outputs.added_modified }}; do
               if echo "${changed_file}" | grep -E "${mirror_regexp}" &> /dev/null; then
                 changed_files="${changed_file} ${changed_files}"
               fi

diff --git a/config.yml b/config.yml
@@ -4,22 +4,24 @@ allowed_outdate: 12h
 mirrors_dir: mirrors.d
 versions:
   - "8"
-  - "8.7"
+  - "8.8"
   - "9"
-  - "9.1"
+  - "9.2"
 # it's also used for mapping <major version>:<full version>
 # if a client requests only major version
 duplicated_versions:
-  "8": "8.7"
-  "9": "9.1"
+  "8": "8.8"
+  "9": "9.2"
 vault_versions:
   - "8.3"
   - "8.4"
   - "8.5"
   - "8.6"
+  - "8.7"
   - "8.7-beta"
   - "8.8-beta"
   - "9.0"
+  - "9.1"
   - "9.1-beta"
   - "9.2-beta"
 vault_mirror: http://repo.almalinux.org/vault/
@@ -40,45 +42,45 @@ repos:
   - name: powertools
     path: PowerTools/$basearch/os/
     versions:
-      - "8.7"
+      - "8.8"
   - name: crb
     path: CRB/$basearch/os/
     versions:
-      - "9.1"
+      - "9.2"
   - name: nfv
     path: NFV/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
     arches:
       - x86_64
   - name: rt
     path: RT/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
     arches:
       - x86_64
   - name: extras
     path: extras/$basearch/os/
   - name: ha
     path: HighAvailability/$basearch/os/
     versions:
-      - "8.7"
+      - "8.8"
   - name: highavailability
     path: HighAvailability/$basearch/os/
     versions:
-      - "9.1"
+      - "9.2"
   - name: sap
     path: SAP/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: saphana
     path: SAPHANA/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: resilientstorage
     path: ResilientStorage/$basearch/os/
     arches:
@@ -88,16 +90,16 @@ repos:
   - name: devel
     path: devel/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
     arches:
       - x86_64
       - aarch64
   - name: plus
     path: plus/$basearch/os/
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
 
   # sources repos
   - name: baseos-source
@@ -110,164 +112,164 @@ repos:
     path: PowerTools/Source/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: crb-source
     path: CRB/Source/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: nfv-source
     path: NFV/Source/
     vault: true
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: rt-source
     path: RT/Source/
     vault: true
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: extras-source
     path: extras/Source/
     vault: true
   - name: ha-source
     path: HighAvailability/Source/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: highavailability-source
     path: HighAvailability/Source/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: sap-source
     path: SAP/Source/
     vault: true
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: saphana-source
     path: SAPHANA/Source/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: resilientstorage-source
     path: ResilientStorage/Source/
     vault: true
   - name: devel-source
     path: devel/Source/
     vault: true
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
   - name: plus-source
     path: plus/Source/
     vault: true
     versions:
-      - "8.7"
-      - "9.1"
+      - "8.8"
+      - "9.2"
 
   # debug repos
   - name: baseos-debuginfo
     path: BaseOS/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: baseos-debug
     path: BaseOS/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: appstream-debuginfo
     path: AppStream/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: appstream-debug
     path: AppStream/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: powertools-debuginfo
     path: PowerTools/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: crb-debug
     path: CRB/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: nfv-debuginfo
     path: NFV/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: nfv-debug
     path: NFV/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
     arches:
       - x86_64
   - name: rt-debuginfo
     path: RT/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: rt-debug
     path: RT/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
     arches:
       - x86_64
   - name: extras-debuginfo
     path: extras/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: extras-debug
     path: extras/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: ha-debuginfo
     path: HighAvailability/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: highavailability-debug
     path: HighAvailability/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: sap-debug
     path: SAP/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: saphana-debug
     path: SAPHANA/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: sap-debuginfo
     path: SAP/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: saphana-debuginfo
     path: SAPHANA/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: resilientstorage-debuginfo
     path: ResilientStorage/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: resilientstorage-debug
     path: ResilientStorage/debug/$basearch/
     vault: true
@@ -276,48 +278,48 @@ repos:
       - ppc64le
       - s390x
     versions:
-      - "9.1"
+      - "9.2"
   - name: devel-debuginfo
     path: devel/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
     arches:
       - x86_64
       - aarch64
   - name: devel-debug
     path: devel/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
   - name: plus-debuginfo
     path: plus/debug/$basearch/
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: plus-debug
     path: plus/debug/$basearch/
     vault: true
     versions:
-      - "9.1"
+      - "9.2"
 
   ## raspberry pi repos
   - name: raspberrypi
     path: raspberrypi/$basearch/os/
     arches:
       - aarch64
     versions:
-      - "8.7"
+      - "8.8"
   - name: raspberrypi-source
     path: raspberrypi/Source
     vault: true
     versions:
-      - "8.7"
+      - "8.8"
   - name: raspberrypi-debuginfo
     path: raspberrypi/debug/$basearch/
     vault: true
     arches:
       - aarch64
     versions:
-      - "8.7"
+      - "8.8"
 ...
diff --git a/mirrors.d/alma.acidman.thelefty.org.yml b/mirrors.d/alma.acidman.thelefty.org.yml
@@ -0,0 +1,15 @@
+---
+name: alma.acidman.thelefty.org
+address:
+  http: http://alma.acidman.thelefty.org/almalinux/
+  https: https://alma.acidman.thelefty.org/almalinux/
+geolocation:
+  continent: Asia
+  country: JP
+  city: Fukuoka
+update_frequency: 3h
+sponsor: Monochrome Rainbow
+sponsor_url: http://www.thelefty.org/
+email: [email protected]
+asn: 59105
+...