Skip to content

Commit e8ef88b

Browse files
committed
.github/workflows: Use ssh-runner.yml from weshnet (not berty)
Signed-off-by: Jeff Thompson <jeff@thefirst.org>
1 parent ba6b73a commit e8ef88b

File tree

2 files changed

+14
-51
lines changed

2 files changed

+14
-51
lines changed

.github/workflows/ssh-runner.yml

Lines changed: 14 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ on:
33
workflow_dispatch:
44
inputs:
55
os:
6-
description: "Operating System"
6+
description: 'Operating System'
77
required: true
88
default: ubuntu-latest
99
type: choice
1010
options:
11-
- ubuntu-latest
12-
- macos-latest
13-
- windows-latest
11+
- ubuntu-latest
12+
- macos-latest
13+
- windows-latest
1414
mod:
15-
description: "Install Go/Node modules"
15+
description: 'Install Go/Node modules'
1616
required: true
1717
default: true
1818
type: boolean
@@ -43,64 +43,29 @@ jobs:
4343
asdf install golang
4444
echo "go_version=$(asdf current golang | xargs | cut -d ' ' -f 2)" >> $GITHUB_ENV
4545
46-
- name: Setup node
47-
if: runner.os != 'Windows'
48-
run: |
49-
asdf plugin add nodejs
50-
asdf install nodejs
51-
echo "node_version=$(asdf current nodejs | xargs | cut -d ' ' -f 2)" >> $GITHUB_ENV
52-
53-
- name: Setup yarn
54-
if: runner.os != 'Windows'
55-
run: |
56-
asdf plugin add yarn
57-
asdf install yarn
58-
5946
- name: Cache go modules
6047
if: github.event.inputs.mod == 'true' && runner.os != 'Windows'
6148
uses: actions/cache@v2.1.6
6249
with:
6350
path: ~/go/pkg/mod
64-
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('go/**/go.sum') }}
51+
key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }}
6552
restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-
6653

67-
- name: Cache node modules
68-
if: github.event.inputs.mod == 'true' && runner.os != 'Windows'
69-
uses: actions/cache@v2.1.6
70-
with:
71-
path: js/node_modules
72-
key: ${{ runner.OS }}-node-${{ env.node_version }}-${{ env.json_cache-versions_node }}-${{ hashFiles('js/yarn.lock') }}
73-
restore-keys: ${{ runner.OS }}-node-${{ env.node_version }}-${{ env.json_cache-versions_node }}-
74-
7554
- name: Fetch go modules
7655
if: github.event.inputs.mod == 'true' && runner.os != 'Windows'
77-
working-directory: go
56+
working-directory: .
7857
run: go mod tidy
7958

80-
- name: Fetch node modules
81-
if: github.event.inputs.mod == 'true' && runner.os != 'Windows'
82-
working-directory: js
83-
run: make node_modules
84-
8559
- name: Install emacs
8660
shell: bash
8761
run: |
88-
if [ "$RUNNER_OS" == "Linux" ]; then
89-
sudo apt-get install -y emacs
90-
elif [ "$RUNNER_OS" == "Windows" ]; then
91-
choco install emacs
92-
else
93-
echo "Already installed!"
94-
fi
95-
96-
- name: Install LazyVim
97-
shell: bash
98-
run: |
99-
if [ "$RUNNER_OS" == "Windows" ]; then
100-
git clone https://github.com/LazyVim/starter $env:LOCALAPPDATA\nvim
101-
else
102-
git clone https://github.com/LazyVim/starter ~/.config/nvim
103-
fi
62+
if [ "$RUNNER_OS" == "Linux" ]; then
63+
sudo apt-get install -y emacs
64+
elif [ "$RUNNER_OS" == "Windows" ]; then
65+
choco install emacs
66+
else
67+
echo "Already installed!"
68+
fi
10469
10570
- name: Setup tmate session
10671
uses: mxschmitt/action-tmate@v3

.tool-versions

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
golang 1.22.5
22
golangci-lint 1.57.2
3-
# Add nodejs for the CI workflows
4-
nodejs 16.16.0

0 commit comments

Comments
 (0)