Reorder build a bit

This commit is contained in:
Jesper Louis Andersen 2021-06-19 12:26:52 +02:00
parent a271797641
commit 756c222877
2 changed files with 43 additions and 40 deletions

View File

@ -7,6 +7,8 @@ _versions: {
rebar3: "3.16.1" rebar3: "3.16.1"
} }
_branch: "master"
#Name: string #Name: string
#Branches: branches: [...string] #Branches: branches: [...string]
#Tags: tags: [...string] #Tags: tags: [...string]
@ -30,7 +32,7 @@ _versions: {
} }
#Steps: #Uses | #Run #Steps: #Uses | #Run
#OS_Version: "ubuntu-latest" | "macos-latest" | "windows_latest" #OS_Version: *"ubuntu-latest" | "macos-latest" | "windows_latest"
#Jobs: ci: { #Jobs: ci: {
name: string name: string
@ -46,28 +48,26 @@ _versions: {
name: #Name & "build" name: #Name & "build"
on: #On & { on: #On & {
push: branches: [ push: branches: [
"master", _branch,
] ]
pull_request: branches: [ pull_request: branches: [
"master", _branch,
] ]
} }
jobs: #Jobs & { jobs: #Jobs
ci: { jobs: ci: {
name: "Run checks and tests over ${{matrix.otp_vsn}} and ${{matrix.os}}" name: "Run checks and tests over ${{matrix.otp_vsn}} and ${{matrix.os}}"
"runs-on": "${{matrix.os}}" "runs-on": "${{matrix.os}}"
strategy: matrix: { strategy: matrix: {
otp_vsn: _versions.all otp_vsn: _versions.all
os: ["ubuntu-latest"] os: ["ubuntu-latest"]
} }
steps: [ }
jobs: ci: steps:
[
{ {
uses: "actions/checkout@v2" uses: "actions/checkout@v2"
}, },
{
name: "Update apt-get database"
run: "sudo apt-get update"
},
{ {
uses: "erlef/setup-beam@v1" uses: "erlef/setup-beam@v1"
with: { with: {
@ -75,6 +75,10 @@ jobs: #Jobs & {
"rebar3-version": _versions.rebar3 "rebar3-version": _versions.rebar3
} }
}, },
{
name: "Update apt-get database"
run: "sudo apt-get update"
},
{ {
name: "Install libsodium" name: "Install libsodium"
run: "sudo apt-get install -y libsodium-dev" run: "sudo apt-get install -y libsodium-dev"
@ -87,4 +91,3 @@ jobs: #Jobs & {
name: "Run the tests" name: "Run the tests"
run: "make tests" run: "make tests"
}] }]
}}

View File

@ -20,12 +20,12 @@ jobs:
- ubuntu-latest - ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Update apt-get database
run: sudo apt-get update
- uses: erlef/setup-beam@v1 - uses: erlef/setup-beam@v1
with: with:
otp-version: ${{matrix.otp_vsn}} otp-version: ${{matrix.otp_vsn}}
rebar3-version: 3.16.1 rebar3-version: 3.16.1
- name: Update apt-get database
run: sudo apt-get update
- name: Install libsodium - name: Install libsodium
run: sudo apt-get install -y libsodium-dev run: sudo apt-get install -y libsodium-dev
- name: Compile source code - name: Compile source code