Skip to content

Commit 65719a6

Browse files
authored
update lotus version for devnet, undo menu drawer (#461)
* update lotus version for devnet, undo menu drawer * update GA files
1 parent fb0ccb9 commit 65719a6

File tree

5 files changed

+59
-71
lines changed

5 files changed

+59
-71
lines changed

.github/image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN git submodule update --init
2323
RUN go mod download
2424

2525
# Stage 2: Install Lotus binary
26-
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.32.0-rc3-devnet AS lotus-test
26+
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.32.1-devnet AS lotus-test
2727

2828
# Stage 3: Build the final image
2929
FROM myoung34/github-runner AS curio-github-runner

.github/utils/create-runner-image.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ setup_github_runner() {
2020
git clone https://github.com/filecoin-project/boost.git
2121

2222
# Copy necessary files
23-
cp -r boost/.github/utils/* .
23+
cp -r curio/.github/utils/* .
2424

2525
# Copy the Dockerfile
26-
cp boost/.github/image/Dockerfile .
26+
cp curio/.github/image/Dockerfile .
2727

2828
# Build the Docker image
2929
docker buildx build -t curio/github-runner:latest .
3030
}
3131

3232
# Execute the function
33+
docker system prune -a -f
3334
setup_github_runner

.github/utils/setup.md

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,76 @@
11
## How to set up Github Action runner
22
1. Clone this repo and copy out the files in this directory to one level above
3-
```shell
4-
mkdir github-runner
5-
6-
cd github-runner
7-
8-
git clone https://github.com/filecoin-project/curio.git
9-
git clone https://github.com/filecoin-project/boost.git
10-
11-
cp -r boost/.github/utils/* .
12-
```
3+
```shell
4+
mkdir github-runner
5+
6+
cd github-runner
7+
8+
git clone https://github.com/filecoin-project/curio.git
9+
git clone https://github.com/filecoin-project/boost.git
10+
11+
cp -r curio/.github/utils/* .
12+
```
1313
2. Copy the Dockerfile
1414

15-
```shell
16-
copy boost/.github/image/Dockerfile .
17-
```
15+
```shell
16+
copy curio/.github/image/Dockerfile .
17+
```
1818

1919
3. Create new image
2020

21-
```shell
22-
docker buildx build -t curio/github-runner:latest .
23-
```
21+
```shell
22+
docker buildx build -t curio/github-runner:latest .
23+
```
2424

2525
4. Create systemd file. Please ensure to equal number files for Boost and Curio. If server can host 10 runner then 5 should be for Boost and 5 for Curio.
2626

27-
```shell
28-
for i in {1..5}; do cat github-actions-runner.service | sed "s/NUM/$i/g" > github-actions-runner$i.service; done
29-
for i in {6..10}; do cat github-actions-runner.service | sed 's/curio-/boost-/g' | sed "s/NUM/$i/g" > github-actions-runner$i.service; done
30-
for i in {1..10}; do install -m 644 github-actions-runner$i.service /etc/systemd/system/ ; done
31-
systemctl daemon-reload
32-
```
27+
```shell
28+
for i in {1..5}; do cat github-actions-runner.service | sed "s/NUM/$i/g" > github-actions-runner$i.service; done
29+
for i in {6..10}; do cat github-actions-runner.service | sed 's/curio-/boost-/g' | sed "s/NUM/$i/g" > github-actions-runner$i.service; done
30+
for i in {1..10}; do install -m 644 github-actions-runner$i.service /etc/systemd/system/ ; done
31+
systemctl daemon-reload
32+
```
3333
5. Add the token to ENV files
34+
35+
```shell
36+
vi boost-github-actions-runner.env
37+
```
38+
add the token
39+
```text
40+
LABELS=docker
41+
ACCESS_TOKEN=<TOKEN> --- Replace with a PAT
42+
```
43+
3444
6. Copy the ENV files to /etc
3545

36-
```shell
37-
cp boost-github-actions-runner.env
38-
cp curio-github-actions-runner.env
39-
```
46+
```shell
47+
cp boost-github-actions-runner.env /etc/
48+
cp curio-github-actions-runner.env /etc/
49+
```
4050

4151
7. Start and Enable the services
42-
```shell
43-
for i in {1..10}; do systemctl start github-actions-runner$i.service; done
44-
for i in {1..10}; do systemctl status github-actions-runner$i.service; done
45-
for i in {1..10}; do systemctl enable github-actions-runner$i.service; done
46-
```
52+
```shell
53+
for i in {1..10}; do systemctl start github-actions-runner$i.service; done
54+
for i in {1..10}; do systemctl status github-actions-runner$i.service; done
55+
for i in {1..10}; do systemctl enable github-actions-runner$i.service; done
56+
```
4757

4858
8. Verify that new runners are visible in the repo.
4959

5060
## Set up docker image creator
5161
1. Make the script executable
52-
```shell
53-
cd github-runner
54-
chmod +x create-runner-image.sh
55-
```
62+
```shell
63+
cd github-runner
64+
chmod +x create-runner-image.sh
65+
```
5666
2. Create a cron job to update the image every day
57-
```shell
58-
crontab -e
59-
```
60-
61-
```shell
62-
0 0 * * * /root/github-runner/create-runner-image.sh
63-
```
67+
```shell
68+
crontab -e
69+
```
70+
add the below line
71+
```shell
72+
0 0 * * * /root/github-runner/create-runner-image.sh
73+
```
6474

6575
## Github Token
6676
Creating GitHub personal access token (PAT) for using by self-hosted runner make sure the following scopes are selected:
@@ -74,4 +84,4 @@ notifications
7484
workflow
7585
```
7686

77-
## This setup is based in the https://github.com/myoung34/docker-github-actions-runner
87+
This setup is based on the https://github.com/myoung34/docker-github-actions-runner

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ build_lotus?=0
264264
curio_docker_user?=curio
265265
curio_base_image=$(curio_docker_user)/curio-all-in-one:latest-debug
266266
ffi_from_source?=0
267-
lotus_version?=v1.32.0-rc3
267+
lotus_version?=v1.32.1
268268

269269
ifeq ($(build_lotus),1)
270270
# v1: building lotus image with provided lotus version

web/static/ux/curio-ux.mjs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,7 @@ class CurioUX extends LitElement {
137137
<path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"></path>
138138
</symbol>
139139
</svg>
140-
<div class="wide-content">
141-
${this.renderMenu(active)}
142-
</div>
143-
<ui-drawer class="drawer" anchor="left" label="Menu">
144-
<div slot="content">
145-
${this.renderMenu(active)}
146-
</div>
147-
</ui-drawer>
140+
${this.renderMenu(active)}
148141
${this.message ? html`<div class="alert alert-primary" role="alert">${this.message}</div>` : html``}
149142
<slot class="curio-slot" style="margin-left: 10px"></slot>
150143
`;
@@ -247,22 +240,6 @@ class CurioUX extends LitElement {
247240
</div>
248241
`;
249242
}
250-
251-
firstUpdated() {
252-
super.firstUpdated();
253-
254-
setTimeout(() => {
255-
// Target only the menu drawer inside curio-ux's shadow root
256-
const menuDrawer = this.shadowRoot.querySelector('ui-drawer[anchor="left"]');
257-
258-
if (menuDrawer) {
259-
menuDrawer.isOpen = false; // Ensure only menu starts closed
260-
console.log("Menu drawer found and set to closed");
261-
} else {
262-
console.warn("Menu drawer not found inside curio-ux");
263-
}
264-
}, 100);
265-
}
266243
};
267244

268245
customElements.define('curio-ux', CurioUX);

0 commit comments

Comments
 (0)