Land #979

author: Theo Buehler <tb@openbsd.org> 2023-12-19 15:07:40 +0100
committer: Theo Buehler <tb@openbsd.org> 2023-12-19 15:07:40 +0100
commit: a21a50397a7ae59315c5a5be2c73b1af142712d1 (patch)
tree: 4bf0ffe14b79e4ef7b14c2aed4c57593cc41c9e1
parent: 30eff1169eb0cd62cee4ac44dac2eee76bddf7ea (diff)
parent: 747c270d93f4525b33afbc5874cf1d935884d01a (diff)
download: portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.tar.gz
portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.tar.bz2
portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.zip
3 files changed, 64 insertions, 46 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..e68ef4d
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,63 @@
+# GitHub Actions workflow to run tests on Windows.
+name: "Windows"
+on:
+  push: {}
+  pull_request: {}
+  schedule:
+    - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
+jobs:
+  test:
+    name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }})"
+    runs-on: "${{ matrix.os }}"
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["windows-2022", "windows-2019"]
+        arch: ["ARM64", "x64", "Win32"]
+        include:
+          - os: "windows-2022"
+            generator: "Visual Studio 17 2022"
+          - os: "windows-2019"
+            generator: "Visual Studio 16 2019"
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+      - name: "Setup MSYS2"
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            diffutils
+            gcc
+            git
+            patch
+            perl
+      - name: "Update"
+        shell: msys2 {0}
+        run: ./update.sh
+      - name: "Configure CMake"
+        shell: cmd
+        run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local
+      - name: "Build"
+        shell: cmd
+        run: cmake --build build --config Release
+      - name: "Test"
+        if: matrix.arch != 'ARM64'
+        shell: cmd
+        run: ctest --test-dir build -C Release --output-on-failure
+      - name: "Upload build artifacts"
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{ matrix.os }}-${{ matrix.arch }}-build-results"
+          path: "build"
diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml
deleted file mode 100644
index bac948e..0000000
--- a/.github/workflows/windows_test.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: windows_ci
-on: [push, pull_request]
-jobs:
-  build-native:
-    strategy:
-      matrix:
-        os: [windows-2019, windows-2022]
-        arch: [Win32, x64, ARM64]
-        include:
-          - generator: "Visual Studio 16 2019"
-            os: windows-2019
-          - generator: "Visual Studio 17 2022"
-            os: windows-2022
-    runs-on: ${{ matrix.os }}
-    continue-on-error: false
-    name: ${{ matrix.os }} - ${{ matrix.arch }}
-    steps:
-      - uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: >-
-            autoconf
-            automake
-            diffutils
-            libtool
-            gcc
-            git
-            patch
-            perl
-      - uses: actions/checkout@main
-      - shell: msys2 {0}
-        run: ./autogen.sh
-      - shell: cmd
-        run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local
-      - shell: cmd
-        run: cmake --build build --config Release
-      - shell: cmd
-        if: ${{ matrix.arch != 'ARM64' }}
-        run: ctest --test-dir build -C Release --output-on-failure
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: windows-build-results-${{ matrix.os }}-${{ matrix.arch }}
-          path: build
diff --git a/README.md b/README.md
index c623fe9..77f9a37 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux.yml)
 [![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos.yml)
+[![Windows Build Status](https://github.com/libressl/portable/actions/workflows/windows.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/windows.yml)
 [![Android Build Status](https://github.com/libressl/portable/actions/workflows/android.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android.yml)
 [![Solaris Build Status](https://github.com/libressl/portable/actions/workflows/solaris.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/solaris.yml)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl)
author	Theo Buehler <tb@openbsd.org>	2023-12-19 15:07:40 +0100
committer	Theo Buehler <tb@openbsd.org>	2023-12-19 15:07:40 +0100
commit	a21a50397a7ae59315c5a5be2c73b1af142712d1 (patch)
tree	4bf0ffe14b79e4ef7b14c2aed4c57593cc41c9e1
parent	30eff1169eb0cd62cee4ac44dac2eee76bddf7ea (diff)
parent	747c270d93f4525b33afbc5874cf1d935884d01a (diff)
download	portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.tar.gz portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.tar.bz2 portable-a21a50397a7ae59315c5a5be2c73b1af142712d1.zip

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..e68ef4d --- /dev/null +++ b/.github/workflows/windows.yml
@@ -0,0 +1,63 @@
		1	# GitHub Actions workflow to run tests on Windows.
		2	name: "Windows"
		3
		4	on:
		5	push: {}
		6	pull_request: {}
		7	schedule:
		8	- cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
		9
		10	jobs:
		11	test:
		12	name: "${{ matrix.os }}/${{ matrix.arch }} (${{ matrix.generator }})"
		13	runs-on: "${{ matrix.os }}"
		14	permissions:
		15	contents: read
		16	strategy:
		17	fail-fast: false
		18	matrix:
		19	os: ["windows-2022", "windows-2019"]
		20	arch: ["ARM64", "x64", "Win32"]
		21	include:
		22	- os: "windows-2022"
		23	generator: "Visual Studio 17 2022"
		24	- os: "windows-2019"
		25	generator: "Visual Studio 16 2019"
		26	steps:
		27	- name: "Checkout repository"
		28	uses: actions/checkout@v4
		29
		30	- name: "Setup MSYS2"
		31	uses: msys2/setup-msys2@v2
		32	with:
		33	update: true
		34	install: >-
		35	diffutils
		36	gcc
		37	git
		38	patch
		39	perl
		40
		41	- name: "Update"
		42	shell: msys2 {0}
		43	run: ./update.sh
		44
		45	- name: "Configure CMake"
		46	shell: cmd
		47	run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local
		48
		49	- name: "Build"
		50	shell: cmd
		51	run: cmake --build build --config Release
		52
		53	- name: "Test"
		54	if: matrix.arch != 'ARM64'
		55	shell: cmd
		56	run: ctest --test-dir build -C Release --output-on-failure
		57
		58	- name: "Upload build artifacts"
		59	if: always()
		60	uses: actions/upload-artifact@v4
		61	with:
		62	name: "${{ matrix.os }}-${{ matrix.arch }}-build-results"
		63	path: "build"


diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml deleted file mode 100644 index bac948e..0000000 --- a/.github/workflows/windows_test.yml +++ /dev/null
@@ -1,46 +0,0 @@
1	name: windows_ci
2
3	on: [push, pull_request]
4
5	jobs:
6	build-native:
7	strategy:
8	matrix:
9	os: [windows-2019, windows-2022]
10	arch: [Win32, x64, ARM64]
11	include:
12	- generator: "Visual Studio 16 2019"
13	os: windows-2019
14	- generator: "Visual Studio 17 2022"
15	os: windows-2022
16	runs-on: ${{ matrix.os }}
17	continue-on-error: false
18	name: ${{ matrix.os }} - ${{ matrix.arch }}
19	steps:
20	- uses: msys2/setup-msys2@v2
21	with:
22	update: true
23	install: >-
24	autoconf
25	automake
26	diffutils
27	libtool
28	gcc
29	git
30	patch
31	perl
32	- uses: actions/checkout@main
33	- shell: msys2 {0}
34	run: ./autogen.sh
35	- shell: cmd
36	run: cmake -Bbuild -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=../local
37	- shell: cmd
38	run: cmake --build build --config Release
39	- shell: cmd
40	if: ${{ matrix.arch != 'ARM64' }}
41	run: ctest --test-dir build -C Release --output-on-failure
42	- uses: actions/upload-artifact@v3
43	if: always()
44	with:
45	name: windows-build-results-${{ matrix.os }}-${{ matrix.arch }}
46	path: build


diff --git a/README.md b/README.md index c623fe9..77f9a37 100644 --- a/README.md +++ b/README.md
@@ -3,6 +3,7 @@
3		3
4	[![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux.yml)	4	[![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux.yml)
5	[![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos.yml)	5	[![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos.yml)
		6	[![Windows Build Status](https://github.com/libressl/portable/actions/workflows/windows.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/windows.yml)
6	[![Android Build Status](https://github.com/libressl/portable/actions/workflows/android.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android.yml)	7	[![Android Build Status](https://github.com/libressl/portable/actions/workflows/android.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android.yml)
7	[![Solaris Build Status](https://github.com/libressl/portable/actions/workflows/solaris.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/solaris.yml)	8	[![Solaris Build Status](https://github.com/libressl/portable/actions/workflows/solaris.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/solaris.yml)
8	[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl)	9	[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl)