diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index ea0c493..c905c77 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -67,7 +67,7 @@ index 2caf36b85c..b4ce3cde16 100644 configure_script: - ./boot.sh diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index c4487226be..d9a4d4320f 100644 +index c4487226be..a93cc5d25f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -6,7 +6,7 @@ jobs: @@ -88,19 +88,66 @@ index c4487226be..d9a4d4320f 100644 timeout-minutes: 30 strategy: -@@ -113,6 +113,12 @@ jobs: - - name: checkout - uses: actions/checkout@v2 +@@ -111,7 +111,13 @@ jobs: + steps: + - name: checkout +- uses: actions/checkout@v2 ++ uses: actions/checkout@v3 ++ + - name: fix up /etc/hosts + # https://github.com/actions/virtual-environments/issues/3353 + run: | + cat /etc/hosts + sudo sed -i "/don't remove this line/d" /etc/hosts || true -+ + - name: create ci signature file for the dpdk cache key if: matrix.dpdk != '' || matrix.dpdk_shared != '' - # This will collect most of DPDK related lines, so hash will be different +@@ -125,7 +131,7 @@ jobs: + + - name: cache + if: matrix.dpdk != '' || matrix.dpdk_shared != '' +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + env: + matrix_key: ${{ matrix.dpdk }}${{ matrix.dpdk_shared }} + ci_key: ${{ hashFiles('dpdk-ci-signature') }} +@@ -153,7 +159,7 @@ jobs: + + - name: upload deb packages + if: matrix.deb_package != '' +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: deb-packages + path: '/home/runner/work/ovs/*.deb' +@@ -172,7 +178,7 @@ jobs: + + - name: upload logs on failure + if: failure() || cancelled() +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: logs-linux-${{ join(matrix.*, '-') }} + path: logs.tgz +@@ -191,7 +197,7 @@ jobs: + + steps: + - name: checkout +- uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + - name: install dependencies + run: brew install automake libtool + - name: prepare +@@ -200,7 +206,7 @@ jobs: + run: PATH="$PATH:$HOME/bin" ./.ci/osx-build.sh + - name: upload logs on failure + if: failure() +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: logs-osx-clang---disable-ssl + path: config.log diff --git a/Documentation/automake.mk b/Documentation/automake.mk index ea3475f356..2b0ad9554f 100644 --- a/Documentation/automake.mk diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 9b828bd..645cb3b 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 124%{?dist} +Release: 125%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Thu Oct 13 2022 Open vSwitch CI - 2.15.0-125 +- Merging upstream branch-2.15 [RH git: f665a8bee1] + Commit list: + b0fac20b33 github: Update versions of action dependencies. + + * Fri Oct 07 2022 Open vSwitch CI - 2.15.0-124 - Merging upstream branch-2.15 [RH git: a5332540ff] Commit list: