Skip to content

Commit 1f4a2be

Browse files
committed
Fix earthly try
1 parent f960093 commit 1f4a2be

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fi
3030
git checkout -b "$branch" || true
3131
- name: Earthly pipeline
32-
run: earthly --org ontola --ci --sat rick --output -P +main-pipeline --artifact +e2e/test-results --tag=${{ github.sha }}
32+
run: earthly --org ontola --ci --sat henk --output -P +main-pipeline --artifact +e2e/test-results --tag=${{ github.sha }}
3333
- name: Upload test artifacts
3434
uses: actions/upload-artifact@v3
3535
if: failure()

CONTRIBUTE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ There are `earthfile`s in `browser` and in `atomic-server`.
5656
These can be used by Earthly to build all steps, including a full docker image.
5757

5858
- Make sure `earthly` is installed
59-
- `earthly --org ontola -P --satellite rick --artifact +e2e/test-results +main-pipeline`
59+
- `earthly --org ontola -P --satellite henk --artifact +e2e/test-results +main-pipeline`
6060

6161
## Improve local compilation speed
6262

Earthfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
VERSION 0.7
1+
VERSION --try 0.7
22
PROJECT ontola/atomic-server
33
IMPORT ./browser AS browser
4-
FROM rust:latest
4+
FROM rust:1.73.0-buster
55
WORKDIR /code
66

77
main-pipeline:
@@ -78,9 +78,13 @@ e2e:
7878
RUN pnpm install
7979
RUN pnpm playwright-install
8080
ENV DELETE_PREVIOUS_TEST_DRIVES="false"
81-
WITH DOCKER \
82-
--load test:latest=+docker
83-
RUN docker run -d -p 80:80 test:latest & \
84-
pnpm run test-e2e
85-
END
86-
SAVE ARTIFACT /app/data-browser/test-results /test-results
81+
TRY
82+
WITH DOCKER \
83+
--load test:latest=+docker
84+
RUN docker run -d -p 80:80 test:latest & \
85+
pnpm run test-e2e
86+
END
87+
FINALLY
88+
SAVE ARTIFACT /app/data-browser/test-results AS LOCAL ./test-results
89+
END
90+
SAVE ARTIFACT ./test-results ./test-results

0 commit comments

Comments
 (0)