aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.github/workflows/deploy-docs-openssl-org.yml23
-rw-r--r--.github/workflows/os-zoo.yml2
-rw-r--r--.github/workflows/style-checks.yml52
-rw-r--r--.github/workflows/windows.yml21
-rw-r--r--.github/workflows/windows_comp.yml39
6 files changed, 132 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c1fed8..253042f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -608,7 +608,7 @@ jobs:
- name: make
run: make -s -j4
- name: Setup Python
- uses: actions/setup-python@v5.1.0
+ uses: actions/setup-python@v5.1.1
with:
python-version: ${{ matrix.PYTHON }}
- uses: dtolnay/rust-toolchain@master
diff --git a/.github/workflows/deploy-docs-openssl-org.yml b/.github/workflows/deploy-docs-openssl-org.yml
new file mode 100644
index 0000000..7b8e683
--- /dev/null
+++ b/.github/workflows/deploy-docs-openssl-org.yml
@@ -0,0 +1,23 @@
+name: "Trigger docs.openssl.org deployment"
+
+on:
+ push:
+ branches:
+ - "openssl-3.[0-9]+"
+ - "master"
+ paths:
+ - "doc/man*/**"
+
+jobs:
+ trigger:
+ runs-on: ubuntu-latest
+ steps:
+ - name: "Trigger deployment workflow"
+ run: |
+ gh workflow run -f branch=${{ github.ref_name }} deploy-site.yaml
+ sleep 3
+ RUN_ID=$(gh run list -w deploy-site.yaml -L 1 --json databaseId -q ".[0].databaseId")
+ gh run watch ${RUN_ID} --exit-status
+ env:
+ GH_REPO: "openssl/openssl-docs"
+ GH_TOKEN: ${{ secrets.OPENSSL_MACHINE_TOKEN }}
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 9dfc2fa..884c085 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -27,7 +27,7 @@ jobs:
image: docker.io/library/alpine:${{ matrix.tag }}
env:
# https://www.openwall.com/lists/musl/2022/02/16/14
- EXTRA_CFLAGS: ${{ matrix.cc == 'clang' && '-Wno-sign-compare -Wno-switch-default' || '' }}
+ EXTRA_CFLAGS: ${{ matrix.cc == 'clang' && '-Wno-sign-compare' || '' }}
CC: ${{ matrix.cc }}
steps:
- name: install packages
diff --git a/.github/workflows/style-checks.yml b/.github/workflows/style-checks.yml
new file mode 100644
index 0000000..69c9ca6
--- /dev/null
+++ b/.github/workflows/style-checks.yml
@@ -0,0 +1,52 @@
+# Copyright 2021-2024 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License"). You may not use
+# this file except in compliance with the License. You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+name: Coding style validation
+
+on: [pull_request]
+
+env:
+ PR_NUMBER: ${{ github.event.number }}
+ GH_TOKEN: ${{ github.token }}
+
+permissions:
+ contents: read
+
+jobs:
+ check-style:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ path: openssl
+ - name: check style for each commit
+ working-directory: openssl
+ shell: bash
+ run: |
+ ERRORS_FOUND=0
+ git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF
+ REFSTART=$(git rev-parse $GITHUB_BASE_REF)
+ REFEND=$(git rev-parse HEAD)
+ echo "Checking from $REFSTART to $REFEND"
+ echo "::group::Style report for commits $REFSTART..$REFEND"
+ set +e
+ ./util/check-format-commit.sh $REFSTART..$REFEND
+ if [ $? -ne 0 ]
+ then
+ ERRORS_FOUND=1
+ fi
+ set -e
+ echo "::endgroup::"
+ SKIP_TEST=$(gh pr view $PR_NUMBER --json labels --jq '.labels[] | select(.name == "style: waived") | .name')
+ if [ -z "$SKIP_TEST" ]
+ then
+ exit $ERRORS_FOUND
+ else
+ echo "PR $PR_NUMBER is marked with style: waived, waiving style check errors"
+ exit 0
+ fi
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c24e7f8..a65229f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -41,7 +41,7 @@ jobs:
- name: config
working-directory: _build
run: |
- perl ..\Configure --banner=Configured no-makedepend ${{ matrix.platform.config }}
+ perl ..\Configure --banner=Configured no-makedepend -DOSSL_WINCTX=openssl ${{ matrix.platform.config }}
perl configdata.pm --dump
- name: build
working-directory: _build
@@ -51,6 +51,21 @@ jobs:
with:
url: "https://download.sysinternals.com/files/Coreinfo.zip"
target: _build/coreinfo/
+ - name: Gather openssl version info
+ working-directory: _build
+ run: |
+ apps/openssl.exe version -v
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1]}
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'}
+ echo "OSSL_VERSION=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+ - name: Set registry keys
+ working-directory: _build
+ run: |
+ echo ${Env:OSSL_VERSION}
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32
- name: get cpu info
working-directory: _build
continue-on-error: true
@@ -88,7 +103,7 @@ jobs:
- name: config
working-directory: _build
run: |
- perl ..\Configure --banner=Configured enable-demos no-makedepend no-shared no-fips enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-trace enable-crypto-mdebug VC-WIN64A-masm
+ perl ..\Configure --banner=Configured enable-demos no-makedepend no-shared no-fips enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-trace enable-crypto-mdebug -DOSSL_WINCTX=openssl VC-WIN64A-masm
perl configdata.pm --dump
- name: build
working-directory: _build
@@ -125,7 +140,7 @@ jobs:
- name: config
working-directory: _build
run: |
- perl ..\Configure --banner=Configured enable-demos no-makedepend no-bulk no-deprecated no-fips no-asm no-threads -DOPENSSL_SMALL_FOOTPRINT
+ perl ..\Configure --banner=Configured enable-demos no-makedepend no-bulk no-deprecated no-fips no-asm no-threads -DOPENSSL_SMALL_FOOTPRINT -DOSSL_WINCTX=openssl
perl configdata.pm --dump
- name: build
working-directory: _build
diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml
index 104e93d..34c5c32 100644
--- a/.github/workflows/windows_comp.yml
+++ b/.github/workflows/windows_comp.yml
@@ -11,6 +11,7 @@ on:
pull_request:
paths:
- 'crypto/comp/*.c'
+ - '.github/workflows/windows_comp.yml'
push:
paths:
- '**.c'
@@ -36,11 +37,27 @@ jobs:
- name: config
working-directory: _build
run: |
- perl ..\Configure enable-comp enable-zstd --with-zstd-include=C:\vcpkg\packages\zstd_x64-windows\include --with-zstd-lib=C:\vcpkg\packages\zstd_x64-windows\lib\zstd.lib no-makedepend VC-WIN64A
+ perl ..\Configure enable-comp enable-zstd --with-zstd-include=C:\vcpkg\packages\zstd_x64-windows\include --with-zstd-lib=C:\vcpkg\packages\zstd_x64-windows\lib\zstd.lib no-makedepend -DOSSL_WINCTX=openssl VC-WIN64A
perl configdata.pm --dump
- name: build
working-directory: _build
run: nmake
+ - name: Gather openssl version info
+ working-directory: _build
+ run: |
+ $env:Path+=";C:\vcpkg\packages\zstd_x64-windows\bin"
+ apps/openssl.exe version -v
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1]}
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'}
+ echo "OSSL_VERSION=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+ - name: Set registry keys
+ working-directory: _build
+ run: |
+ echo ${Env:OSSL_VERSION}
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32
- name: download coreinfo
uses: suisei-cn/actions-download-file@v1.6.0
with:
@@ -50,6 +67,7 @@ jobs:
working-directory: _build
continue-on-error: true
run: |
+ $env:Path+=";C:\vcpkg\packages\zstd_x64-windows\bin"
7z.exe x coreinfo/Coreinfo.zip
./Coreinfo64.exe -accepteula -f
./apps/openssl.exe version -c
@@ -78,11 +96,27 @@ jobs:
- name: config
working-directory: _build
run: |
- perl ..\Configure enable-comp enable-brotli --with-brotli-include=C:\vcpkg\packages\brotli_x64-windows\include --with-brotli-lib=C:\vcpkg\packages\brotli_x64-windows\lib no-makedepend VC-WIN64A
+ perl ..\Configure enable-comp enable-brotli --with-brotli-include=C:\vcpkg\packages\brotli_x64-windows\include --with-brotli-lib=C:\vcpkg\packages\brotli_x64-windows\lib no-makedepend -DOSSL_WINCTX=openssl VC-WIN64A
perl configdata.pm --dump
- name: build
working-directory: _build
run: nmake
+ - name: Gather openssl version info
+ working-directory: _build
+ run: |
+ $env:Path+=";C:\vcpkg\packages\brotli_x64-windows\bin"
+ apps/openssl.exe version -v
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1]}
+ apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'}
+ echo "OSSL_VERSION=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+ - name: Set registry keys
+ working-directory: _build
+ run: |
+ echo ${Env:OSSL_VERSION}
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
+ reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32
- name: download coreinfo
uses: suisei-cn/actions-download-file@v1.6.0
with:
@@ -92,6 +126,7 @@ jobs:
working-directory: _build
continue-on-error: true
run: |
+ $env:Path+=";C:\vcpkg\packages\brotli_x64-windows\bin"
7z.exe x coreinfo/Coreinfo.zip
./Coreinfo64.exe -accepteula -f
./apps/openssl.exe version -c
generated by cgit v1.1 at 2024-07-17 08:09:32 +0000