Message ID | 20230620135310.94455-6-frank@lichtenheld.com |
---|---|
State | Accepted |
Headers | show |
Series | Switch to CMake for Windows builds | expand |
It would be nice to see the reason for the version bump in the commit message. Anyway, GHA is happy with this. Acked-by: Lev Stipakov <lstipakov@gmail.com> ti 20. kesäk. 2023 klo 16.54 Frank Lichtenheld (frank@lichtenheld.com) kirjoitti: > > Change-Id: I4183edacc0295e9671c586cfcd77cf687015a22c > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> > --- > .github/workflows/build.yaml | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml > index 5f0a0761..da2a427c 100644 > --- a/.github/workflows/build.yaml > +++ b/.github/workflows/build.yaml > @@ -52,11 +52,10 @@ jobs: > uses: actions/checkout@v3 > > - name: Restore from cache and install vcpkg > - uses: lukka/run-vcpkg@v10 > + uses: lukka/run-vcpkg@v11 > with: > - vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' > + vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' > vcpkgJsonGlob: '**/mingw/vcpkg.json' > - appendedCacheKey: mingw_${{ matrix.arch }} > > - name: Run CMake with vcpkg.json manifest > uses: lukka/run-cmake@v10 > @@ -291,11 +290,10 @@ jobs: > run: python -m pip install --upgrade pip docutils > > - name: Restore artifacts, or setup vcpkg (do not install any package) > - uses: lukka/run-vcpkg@v10 > + uses: lukka/run-vcpkg@v11 > with: > - vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' > + vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' > vcpkgJsonGlob: '**/windows/vcpkg.json' > - appendedCacheKey: msvc_${{ matrix.arch }} > > - name: Run CMake with vcpkg.json manifest (NO TESTS) > uses: lukka/run-cmake@v10 > -- > 2.34.1 > > > > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel
On Tue, Jun 27, 2023 at 11:40:30AM +0300, Lev Stipakov wrote: > It would be nice to see the reason for the version bump in the commit message. We could add something like: "Uses improved binary cache handling." Not sure that helps much ;) > Anyway, GHA is happy with this. > > Acked-by: Lev Stipakov <lstipakov@gmail.com> Regards,
Whatever it does... GHA and Lev agree that it's fine. (One thing I noticed is that the "msbuild" builds now also run the cmocka tests - this seems to be a new thing, and very welcome!) I have extended the commit message to include the cache thing. Your patch has been applied to the master branch. commit 66e33ee81d1d7fa3495ae3aad6e673766e296687 Author: Frank Lichtenheld Date: Tue Jun 20 15:53:10 2023 +0200 GHA: update to run-vcpkg@v11 Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Lev Stipakov <lstipakov@gmail.com> Message-Id: <20230620135310.94455-6-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26755.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5f0a0761..da2a427c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,11 +52,10 @@ jobs: uses: actions/checkout@v3 - name: Restore from cache and install vcpkg - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' + vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' vcpkgJsonGlob: '**/mingw/vcpkg.json' - appendedCacheKey: mingw_${{ matrix.arch }} - name: Run CMake with vcpkg.json manifest uses: lukka/run-cmake@v10 @@ -291,11 +290,10 @@ jobs: run: python -m pip install --upgrade pip docutils - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' + vcpkgGitCommitId: '1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48' vcpkgJsonGlob: '**/windows/vcpkg.json' - appendedCacheKey: msvc_${{ matrix.arch }} - name: Run CMake with vcpkg.json manifest (NO TESTS) uses: lukka/run-cmake@v10
Change-Id: I4183edacc0295e9671c586cfcd77cf687015a22c Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- .github/workflows/build.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)