Skip to content

Commit c7a681d

Browse files
tirumerlazeljkoX
andauthored
chore: Fix workflow and missing libs in docker file (#157)
* chore: plat-7575 Docs fixes (#153) * chore: adopt docs for netlify deployment * chore: fixes docs sections * chore: revert svg change * chore: improvements * fix: Missing libssl and workflow (#155) * fix: Missing libssl and workflow * chore: Remove comment * chore: Add libcrypto * fix: Docker Compose (#156) --------- Co-authored-by: Zeljko <zeljko89markovic@gmail.com>
1 parent 44257e8 commit c7a681d

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.github/workflows/release-please.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ jobs:
5050
fetch-depth: 0
5151
token: ${{ steps.gh-app-token.outputs.token }}
5252

53-
- name: Check release branch
54-
id: check_branch
55-
run: |
56-
RELEASE_BRANCH=${{ github.ref_name }}
57-
CURRENT_VERSION=$(echo "$RELEASE_BRANCH" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
58-
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_OUTPUT
59-
60-
# Sort release branches
61-
HIGHER_BRANCHES=$(git branch -r | grep release-v | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n +2)
62-
if [[ -n "$HIGHER_BRANCHES" ]]; then
63-
# Extract the highest version
64-
HIGHEST_VERSION=$(echo "$HIGHER_BRANCHES" | tail -n 1)
65-
if [[ "$CURRENT_VERSION" == "$HIGHEST_VERSION" ]]; then
66-
echo "run_release_please=true" >> $GITHUB_OUTPUT
67-
else
68-
echo "run_release_please=false" >> $GITHUB_OUTPUT
69-
echo "Release-please skipped for branch: $RELEASE_BRANCH. Higher versioned release branches exist."
70-
fi
71-
else
72-
echo "run_release_please=true" >> $GITHUB_OUTPUT # if no higher version branch exists run release-please.
73-
fi
53+
# - name: Check release branch
54+
# id: check_branch
55+
# run: |
56+
# RELEASE_BRANCH=${{ github.ref_name }}
57+
# CURRENT_VERSION=$(echo "$RELEASE_BRANCH" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
58+
# echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_OUTPUT
59+
60+
# # Sort release branches
61+
# HIGHER_BRANCHES=$(git branch -r | grep release-v | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n +2)
62+
# if [[ -n "$HIGHER_BRANCHES" ]]; then
63+
# # Extract the highest version
64+
# HIGHEST_VERSION=$(echo "$HIGHER_BRANCHES" | tail -n 1)
65+
# if [[ "$CURRENT_VERSION" == "$HIGHEST_VERSION" ]]; then
66+
# echo "run_release_please=true" >> $GITHUB_OUTPUT
67+
# else
68+
# echo "run_release_please=false" >> $GITHUB_OUTPUT
69+
# echo "Release-please skipped for branch: $RELEASE_BRANCH. Higher versioned release branches exist."
70+
# fi
71+
# else
72+
# echo "run_release_please=true" >> $GITHUB_OUTPUT # if no higher version branch exists run release-please.
73+
# fi
7474

7575
- name: Get merged PR number from commit
7676
id: get_pr
@@ -123,15 +123,15 @@ jobs:
123123
- name: Start release please action
124124
id: release
125125
uses: googleapis/release-please-action@a02a34c4d625f9be7cb89156071d8567266a2445 # v4.2.0
126-
if: ${{ steps.check_branch.outputs.run_release_please == 'true' }}
127126
with:
128127
token: ${{ steps.gh-app-token.outputs.token }}
129128
target-branch: ${{ github.ref_name }}
130129
config-file: .github/release-please/.config.json
131130
manifest-file: .github/release-please/manifest.json
132131

133132
- name: Get release branch name on release please prs
134-
if: ${{ steps.release.outputs.releases_created == 'false' }}
133+
if: ${{ steps.release.outputs.releases_created == 'false' && steps.release.outputs.pr
134+
!= '' }}
135135
id: get_release_branch
136136
run: |
137137
echo "release_branch=${{ fromJSON(steps.release.outputs.pr).headBranchName }}" >> $GITHUB_OUTPUT

Dockerfile.production

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ FROM --platform=${BUILDPLATFORM} cgr.dev/chainguard/glibc-dynamic:latest
2020

2121
WORKDIR /app
2222
COPY --from=base --chown=nonroot:nonroot /usr/app/bin/openzeppelin-relayer /app/openzeppelin-relayer
23+
COPY --from=base /usr/lib/libssl.so.3 /usr/lib/libssl.so.3
24+
COPY --from=base /usr/lib/libcrypto.so.3 /usr/lib/libcrypto.so.3
2325

2426
ENV APP_PORT=8080
2527
ENV METRICS_PORT=8081

docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
services:
55
relayer:
6-
# Needs docker hub registry to be public
76
image: openzeppelin/openzeppelin-relayer:latest
87
build:
98
context: .

0 commit comments

Comments
 (0)