Skip to content

Commit ea79bb8

Browse files
committed
Revert "Move the installation into GH actions"
This reverts commit 26ec1ea.
1 parent 26ec1ea commit ea79bb8

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,6 @@ jobs:
6666
shell: bash
6767
run: ./program-test/install-build-deps.sh
6868

69-
# took the workaround from https://github.com/sfackler/rust-openssl/issues/2149
70-
- name: Setup openssl on Windows
71-
if: runner.os == 'Windows'
72-
shell: bash
73-
run: |
74-
echo "PERL=$(which perl)" >> $GITHUB_ENV
75-
echo "OPENSSL_SRC_PERL=$(which perl)" >> $GITHUB_ENV
76-
choco install openssl --version 3.4.1 --install-arguments="'/DIR=C:\OpenSSL'" -y
77-
echo "OPENSSL_LIB_DIR=C:\OpenSSL\lib\VC\x64\MT" >> $GITHUB_ENV
78-
echo "OPENSSL_INCLUDE_DIR=C:\OpenSSL\include" >> $GITHUB_ENV
79-
8069
- name: Build and test program
8170
shell: bash
8271
run: ./program-test/test.sh

program-test/install-build-deps.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
set -e
33
case $(uname -s | cut -c1-7) in
44
"Windows" | "MINGW64")
5+
export PERL="$(which perl)"
6+
export OPENSSL_SRC_PERL="$(which perl)"
7+
choco install openssl --version 3.4.1 --install-arguments="'/DIR=C:\OpenSSL'" -y
8+
export OPENSSL_LIB_DIR='C:\OpenSSL\lib\VC\x64\MT'
9+
export OPENSSL_INCLUDE_DIR='C:\OpenSSL\include'
510
choco install protoc
611
export PROTOC='C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe'
712
;;

0 commit comments

Comments
 (0)