Skip to content

Commit

Permalink
fix(docker): solve issue with openssl and macos
Browse files Browse the repository at this point in the history
  • Loading branch information
aesedepece committed Nov 11, 2024
1 parent c37598b commit aa53bf6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-helper/action.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build Helpers
description: "Builds & Parallelize Helper images for the compilation then archives them for next stage"

Inputs:
inputs:
imagename:
description: name of the image to tag & upload
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-linux/action.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build Binaries
description: "Builds Linux Binaries"

Inputs:
inputs:
target:
description: Build target architecture
required: true
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/bridge.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Bridge

on:
workflow_run:
workflows: ["Release Tag"]
types: [completed]
workflow_dispatch:
inputs:
force:
Expand Down Expand Up @@ -49,7 +46,7 @@ jobs:
- name: Set Version
run: |
echo VERNUM=$(sed -nE 's/version\s?=\s?"([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9\.]+)?)"/\1/p' ./bridges/centralized-ethereum/Cargo.toml | head -1) >> $GITHUB_ENV
- name: Login to Docker hub Registry
uses: docker/login-action@v3
with:
Expand All @@ -66,7 +63,7 @@ jobs:
docker build -t witnet/witnet-centralized-ethereum-bridge:latest -f ./docker/bridge/Dockerfile .
docker push witnet/witnet-centralized-ethereum-bridge:latest
if: env.prerelease == 'false'


Failure:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
Build_macOs:
needs: [macos_helper]
runs-on: macos-latest
runs-on: macos-12
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
# Build Docker images (Latest & TAG)
- name: Build TAG
run: docker buildx build -f docker/witnet-rust/Dockerfile --progress=plain --build-arg WITNET_VERSION=${{github.ref_name}} --platform linux/amd64,linux/arm64,linux/arm/v7 --tag witnet/witnet-rust:${{github.ref_name}} docker/witnet-rust --push --no-cache

- name: Check Pre-release
run: |
TAG=${{ github.ref_name }}
Expand Down
11 changes: 6 additions & 5 deletions docker/cross-compilation/openssl.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Copyright 2016-2019 Jorge Aparicio, Marco A L Barbosa & bgermann.
#
#
# https://github.com/rust-embedded/cross/blob/master/docker/openssl.sh
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -24,6 +24,7 @@ main() {
local dependencies=(
ca-certificates
curl
wget
m4
make
perl
Expand All @@ -42,8 +43,8 @@ main() {
td=$(mktemp -d)

pushd $td
curl https://www.openssl.org/source/openssl-$version.tar.gz | \
tar --strip-components=1 -xz
wget https://www.openssl.org/source/openssl-$version.tar.gz
tar --strip-components=1 -xzvf openssl-$version.tar.gz
AR=${triple}ar CC=${triple}gcc ./Configure \
--prefix=/openssl \
no-dso \
Expand Down

0 comments on commit aa53bf6

Please sign in to comment.