Unnest ssh-checkout action | Remove unnecessary SSH key additions

This commit is contained in:
abejgonzalez
2021-10-07 23:10:53 -07:00
parent ff41808df4
commit 4584a37951
3 changed files with 114 additions and 47 deletions

View File

@@ -1,14 +0,0 @@
name: ssh-checkout
description: "Checkout code and add SSH keys to access remote build server"
runs:
using: "composite"
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}

View File

@@ -22,16 +22,18 @@ runs:
shell: bash shell: bash
# brute force way to swap between riscv/esp-tools caches # brute force way to swap between riscv/esp-tools caches
- uses: actions/cache@v2 - name: Cache riscv-tools
id: toolchain-build-riscv-tools
if: ${{ inputs.tools-version == "riscv-tools" }} if: ${{ inputs.tools-version == "riscv-tools" }}
uses: actions/cache@v2
id: toolchain-build-riscv-tools
with: with:
path: ${{ inputs.tools-version }}-install path: ${{ inputs.tools-version }}-install
key: ${{ steps.genkey.outputs.riscvtools-cache-key }} key: ${{ steps.genkey.outputs.riscvtools-cache-key }}
- uses: actions/cache@v2 - name: Cache esp-tools
id: toolchain-build-esp-tools
if: ${{ inputs.tools-version == "esp-tools" }} if: ${{ inputs.tools-version == "esp-tools" }}
uses: actions/cache@v2
id: toolchain-build-esp-tools
with: with:
path: ${{ inputs.tools-version }}-install path: ${{ inputs.tools-version }}-install
key: ${{ steps.genkey.outputs.esptools-cache-key }} key: ${{ steps.genkey.outputs.esptools-cache-key }}

View File

@@ -143,7 +143,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build verilator on remote - name: Build verilator on remote
@@ -177,7 +183,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -195,7 +207,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -213,7 +231,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -232,7 +256,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -250,7 +280,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -268,7 +304,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Build RTL - name: Build RTL
@@ -289,7 +331,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -308,7 +351,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -327,7 +371,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -346,7 +391,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -365,7 +411,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -384,7 +431,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -403,7 +451,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -422,7 +471,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -441,7 +491,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -460,7 +511,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -480,7 +532,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -499,7 +552,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -518,7 +572,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -538,7 +593,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -558,7 +614,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -577,7 +634,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -596,7 +654,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -615,7 +674,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -634,7 +694,8 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -653,7 +714,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -673,7 +740,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests
@@ -693,7 +766,13 @@ jobs:
image: ucbbar/chipyard-ci-image:554b436 image: ucbbar/chipyard-ci-image:554b436
options: --entrypoint /bin/bash options: --entrypoint /bin/bash
steps: steps:
- uses: ./.github/actions/ssh-checkout - name: Checkout
uses: actions/checkout@v2
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.SERVERKEY }}
known_hosts: ${{ secrets.BUILDSERVER }}
- uses: ./.github/actions/job-start - uses: ./.github/actions/job-start
id: job-start id: job-start
- name: Run tests - name: Run tests