Skip to content

Commit 9a12dea

Browse files
committed
use explicit env
1 parent 7480cd7 commit 9a12dea

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/compile_sqlite.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
path: openssl-compiled
7979
key: openssl-prebuilt-${{ runner.target }}-3.6.4-${{ hashFiles('tool/build_openssl.dart') }}
8080
- uses: dart-lang/setup-dart@v1
81+
id: setup_dart
8182
if: steps.cache_build.outputs.cache-hit != 'true'
8283

8384
- name: Download OpenSSL
@@ -89,12 +90,17 @@ jobs:
8990
9091
- name: Compile OpenSSL (host)
9192
if: steps.cache_build.outputs.cache-hit != 'true' && !matrix.container
93+
env:
94+
TARGET: matrix.target
9295
run: |
9396
dart pub get
94-
dart run tool/build_openssl.dart ${matrix.target}
97+
dart run tool/build_openssl.dart $TARGET
9598
9699
- name: Compile OpenSSL (container)
97100
if: steps.cache_build.outputs.cache-hit != 'true' && matrix.container
101+
env:
102+
TARGET: matrix.target
103+
DART_VERSION: steps.setup_dart.outputs.dart-version
98104
run: |
99105
docker run -d \
100106
--name openssl-build \
@@ -103,8 +109,8 @@ jobs:
103109
docker exec openssl-build apt update
104110
docker exec openssl-build apt install -y curl gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu gcc-i686-linux-gnu libfindbin-libs-perl perl make
105111
106-
docker exec openssl-build curl -LO https://storage.googleapis.com/dart-archive/channels/stable/release/3.13.3/linux_packages/dart_3.13.3-1_amd64.deb
107-
docker exec openssl-build dpkg -i dart_3.13.3-1_amd64.deb
112+
docker exec openssl-build curl -LO https://storage.googleapis.com/dart-archive/channels/stable/release/$DART_VERSION/linux_packages/dart_$DART_VERSION-1_amd64.deb
113+
docker exec openssl-build dpkg -i dart_$DART_VERSION-1_amd64.deb
108114
109115
docker exec -w /src/ openssl-build dart pub get
110116
docker exec -w /src/ openssl-build dart run tool/build_openssl.dart ${matrix.target}

0 commit comments

Comments
 (0)