Skip to content

Commit 31b7b27

Browse files
authored
Merge branch 'deepmodeling:develop' into develop
2 parents a6a8497 + 94c0cc5 commit 31b7b27

File tree

5 files changed

+6
-98
lines changed

5 files changed

+6
-98
lines changed

.github/workflows/build_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: push
33

44
jobs:
55
test:
6-
runs-on: ubuntu-latest
6+
runs-on: self-hosted
77
strategy:
88
matrix:
99
include:

.github/workflows/container.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- develop
77
- reconstruction
88
- newelpa
9-
9+
1010
jobs:
1111
build_container_and_push:
12-
runs-on: ubuntu-latest
12+
runs-on: self-hosted
1313
strategy:
1414
matrix:
1515
dockerfile: ["gnu","intel","cuda"]

.github/workflows/dynamic.yml

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,9 @@ on:
1111
default: '2'
1212

1313
jobs:
14-
start-runner:
15-
name: Start self-hosted EC2 runner
16-
runs-on: ubuntu-latest
17-
outputs:
18-
label: ${{ steps.start-ec2-runner.outputs.label }}
19-
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
20-
steps:
21-
- name: Configure AWS credentials
22-
uses: aws-actions/configure-aws-credentials@v1
23-
with:
24-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
26-
aws-region: ${{ secrets.AWS_REGION }}
27-
- name: Start EC2 runner
28-
id: start-ec2-runner
29-
uses: machulav/ec2-github-runner@v2
30-
with:
31-
mode: start
32-
github-token: ${{ secrets.PAT }}
33-
ec2-image-id: ami-07758124f42f794bf
34-
ec2-instance-type: c5.4xlarge
35-
subnet-id: subnet-f7edb991
36-
security-group-id: sg-fd5185e7
3714
test:
3815
name: Do the job on the runner
39-
needs: start-runner # required to start the main job when the runner is ready
40-
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
16+
runs-on: self-hosted
4117
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
4218
steps:
4319
- name: Checkout
@@ -55,24 +31,3 @@ jobs:
5531
build_dir: html
5632
env:
5733
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
stop-runner:
59-
name: Stop self-hosted EC2 runner
60-
needs:
61-
- start-runner # required to get output from the start-runner job
62-
- test # required to wait when the main job is done
63-
runs-on: ubuntu-latest
64-
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
65-
steps:
66-
- name: Configure AWS credentials
67-
uses: aws-actions/configure-aws-credentials@v1
68-
with:
69-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
70-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
71-
aws-region: ${{ secrets.AWS_REGION }}
72-
- name: Stop EC2 runner
73-
uses: machulav/ec2-github-runner@v2
74-
with:
75-
mode: stop
76-
github-token: ${{ secrets.PAT }}
77-
label: ${{ needs.start-runner.outputs.label }}
78-
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}

.github/workflows/static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
clang-tidy:
8-
runs-on: ubuntu-latest
8+
runs-on: self-hosted
99
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
1010
steps:
1111
- name: Checkout Pull Request

.github/workflows/test.yml

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,9 @@ on:
1010
- planewave
1111
jobs:
1212

13-
start-runner:
14-
name: Start self-hosted EC2 runner
15-
runs-on: ubuntu-latest
16-
outputs:
17-
label: ${{ steps.start-ec2-runner.outputs.label }}
18-
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
19-
steps:
20-
- name: Configure AWS credentials
21-
uses: aws-actions/configure-aws-credentials@v1
22-
with:
23-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
24-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
25-
aws-region: ${{ secrets.AWS_REGION }}
26-
- name: Start EC2 runner
27-
id: start-ec2-runner
28-
uses: machulav/ec2-github-runner@v2
29-
with:
30-
mode: start
31-
github-token: ${{ secrets.PAT }}
32-
ec2-image-id: ami-07758124f42f794bf
33-
ec2-instance-type: c5.2xlarge
34-
subnet-id: subnet-f7edb991
35-
security-group-id: sg-fd5185e7
3613
test:
3714
name: Do the job on the runner
38-
needs: start-runner # required to start the main job when the runner is ready
39-
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
15+
runs-on: self-hosted
4016
container: ghcr.io/deepmodeling/abacus-development-kit:gnu
4117
steps:
4218
- name: Checkout
@@ -49,26 +25,3 @@ jobs:
4925
run: |
5026
cmake -B build -DBUILD_TESTING=ON
5127
cmake --build build -j16
52-
cmake --install build
53-
cmake --build build --target test ARGS="-V"
54-
stop-runner:
55-
name: Stop self-hosted EC2 runner
56-
needs:
57-
- start-runner # required to get output from the start-runner job
58-
- test # required to wait when the main job is done
59-
runs-on: ubuntu-latest
60-
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
61-
steps:
62-
- name: Configure AWS credentials
63-
uses: aws-actions/configure-aws-credentials@v1
64-
with:
65-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
66-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
67-
aws-region: ${{ secrets.AWS_REGION }}
68-
- name: Stop EC2 runner
69-
uses: machulav/ec2-github-runner@v2
70-
with:
71-
mode: stop
72-
github-token: ${{ secrets.PAT }}
73-
label: ${{ needs.start-runner.outputs.label }}
74-
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}

0 commit comments

Comments
 (0)