Skip to content

Commit 49366d0

Browse files
fix: Fix installation of new versions of firefox-esr (#489)
* fix: Fix installation of new versions of firefox-esr Signed-off-by: Evgeniy Dikevich <[email protected]> * Add catalyst-qa into notification list Signed-off-by: Evgeniy Dikevich <[email protected]> --------- Signed-off-by: Evgeniy Dikevich <[email protected]>
1 parent 97ac22c commit 49366d0

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.github/workflows/update-catalyst-ci-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
uses: ./.github/workflows/update-catalyst-deps.yml
2323
with:
2424
notify_type: ${{ github.event_name == 'workflow_dispatch' && inputs.notify_type || 'pr' }}
25-
repos: ${{ inputs.repos != '' && inputs.repos || 'input-output-hk/catalyst-voices, input-output-hk/hermes, input-output-hk/catalyst-libs, input-output-hk/catalyst-reviews, input-output-hk/catalyst-som, input-output-hk/catalyst-execution, input-output-hk/norns' }}
25+
repos: ${{ inputs.repos != '' && inputs.repos || 'input-output-hk/catalyst-voices, input-output-hk/hermes, input-output-hk/catalyst-libs, input-output-hk/catalyst-reviews, input-output-hk/catalyst-som, input-output-hk/catalyst-execution, input-output-hk/norns, input-output-hk/catalyst-qa' }}
2626
secrets: inherit

earthly/flutter/installer/Earthfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
VERSION 0.8
22

33
# cspell: words Rxxxx
4-
# cspell: ignoreRegExp lib[f-x]
54

65
# An AWS S3 bucket is used to store browser and driver packages.
76
# Packages are updated automatically once a week.
@@ -79,8 +78,9 @@ INSTALL_FIREFOX_LINUX64:
7978

8079
RUN curl -sSL -o /tmp/firefox.zip ${FIREFOX_URL} \
8180
&& unzip /tmp/firefox.zip -d /tmp \
82-
&& gdebi -n /tmp/firefox*.deb \
83-
&& rm -f /tmp/firefox.deb
81+
&& FAILED_PACKAGES=""; for p in /tmp/*.deb; do gdebi -n "$p" || FAILED_PACKAGES="$FAILED_PACKAGES $p"; done; \
82+
if [ -n "$FAILED_PACKAGES" ]; then for p in $FAILED_PACKAGES; do gdebi -n "$p" || echo "Installation failed"; done; fi \
83+
&& rm -f /tmp/*
8484
RUN firefox --version
8585

8686
RUN printf "${BLUE} Installing Geckodriver..."
@@ -126,11 +126,8 @@ INSTALL_CHROMIUM:
126126
RUN printf "${BLUE} Installing ${PACKAGE_TYPE} version: ${version}..." \
127127
&& curl -sSL -o /opt/${PACKAGE_TYPE}.zip ${DOWNLOAD_URL} \
128128
&& unzip /opt/${PACKAGE_TYPE}.zip -d /opt/${PACKAGE_TYPE} \
129-
&& gdebi -n /opt/${PACKAGE_TYPE}/libx*.deb \
130-
&& gdebi -n /opt/${PACKAGE_TYPE}/libf*.deb \
131-
&& gdebi -n /opt/${PACKAGE_TYPE}/libo*.deb \
132-
&& gdebi -n /opt/${PACKAGE_TYPE}/chromium-common*.deb \
133-
&& gdebi -n /opt/${PACKAGE_TYPE}/chromium_*.deb \
129+
&& FAILED_PACKAGES=""; for p in /opt/${PACKAGE_TYPE}/*.deb; do gdebi -n "$p" || FAILED_PACKAGES="$FAILED_PACKAGES $p"; done; \
130+
if [ -n "$FAILED_PACKAGES" ]; then for p in $FAILED_PACKAGES; do gdebi -n "$p" || echo "Installation failed"; done; fi \
134131
&& rm -rf /opt/${PACKAGE_TYPE}*
135132
ELSE
136133
RUN printf "${BLUE} Installing ${PACKAGE_TYPE} version: ${version}..." \

0 commit comments

Comments
 (0)