Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): reenable arm build #6455

Merged
merged 10 commits into from
May 16, 2024
Merged

chore(ci): reenable arm build #6455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11b92be
chore(ci): reenable arm build
ludamad May 16, 2024
11b0395
Update ci-arm.yml
ludamad May 16, 2024
2af8da2
use chromium
ludamad May 16, 2024
8d605d9
revert
ludamad May 16, 2024
562e65b
Update Earthfile
ludamad May 16, 2024
fb26680
install add-apt-repository
ludamad May 16, 2024
341d349
Update Earthfile
ludamad May 16, 2024
705f59b
Update Earthfile
ludamad May 16, 2024
3931cfe
Update ci-arm.yml
ludamad May 16, 2024
d077040
Merge branch 'master' into ad/reenable-arm-ci
ludamad May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions .github/workflows/ci-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI (ARM)
on:
push:
branches: [disabled] # [master]
branches: [master]
workflow_dispatch:
inputs: {}
concurrency:
Expand All @@ -20,14 +20,10 @@ jobs:
needs: setup
runs-on: master-arm
steps:
- {
uses: actions/checkout@v4,
with: { ref: "${{ github.event.pull_request.head.sha }}" },
}
- uses: actions/checkout@v4
with: { ref: "${{ github.event.pull_request.head.sha }}" }
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
# must be globally unique for build x runner
concurrency_key: build-master-arm
# prepare images locally, tagged by commit hash
- name: "Build E2E Image"
Expand All @@ -39,13 +35,10 @@ jobs:
needs: build
runs-on: master-arm
steps:
- {
uses: actions/checkout@v4,
with: { ref: "${{ github.event.pull_request.head.sha }}" },
}
- uses: actions/checkout@v4
with: { ref: "${{ github.event.pull_request.head.sha }}" }
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
concurrency_key: e2e-master-arm-e2e-tests
- name: Test
working-directory: ./yarn-project/end-to-end/
Expand Down
9 changes: 6 additions & 3 deletions yarn-project/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,15 @@ anvil:

end-to-end:
FROM ubuntu:noble
RUN apt-get update && apt-get install -y wget gnupg \
# add repository for chromium
RUN apt-get update && apt-get install -y software-properties-common \
&& add-apt-repository ppa:xtradeb/apps -y && apt-get update \
&& apt-get install -y wget gnupg \
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb [arch=$(dpkg --print-architecture)] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
&& apt update && apt install curl nodejs jq google-chrome-stable netcat-openbsd -y \
&& apt update && apt install curl chromium nodejs netcat-openbsd -y \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im pretty sure this doesn't work?
i think installing chromium actually installs a wrapper that then tries to make you use snap.
which the internet seemed to have little response to.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is e2e-browser passing then?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad. guess it does work

&& rm -rf /var/lib/apt/lists/*
ENV CHROME_BIN="/usr/bin/google-chrome-stable"
ENV CHROME_BIN="/usr/bin/chromium"
ENV PATH=/opt/foundry/bin:$PATH
COPY +anvil/anvil /opt/foundry/bin/anvil
COPY +end-to-end-prod/usr/src /usr/src
Expand Down
Loading