Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into merge-savanna-tokenonmics
Browse files Browse the repository at this point in the history
  • Loading branch information
ericpassmore committed Jun 14, 2024
2 parents 09e8c4f + c30e89e commit ea167cf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .cicd/defaults.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"spring-dev":{
"antelope-spring-dev":{
"target":"main",
"prerelease":false
},
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
pull_request:
workflow_dispatch:
inputs:
override-spring-dev:
description: Override spring-dev target
override-antelope-spring-dev:
description: Override antelope-spring-dev target
type: string
override-spring-dev-prerelease:
override-antelope-spring-dev-prerelease:
type: choice
description: Override spring-dev prelease
description: Override antelope-spring-dev prelease
options:
- default
- true
Expand All @@ -38,22 +38,22 @@ jobs:
name: Build & Test
runs-on: ubuntu-22.04
steps:
- name: Setup spring-dev & cdt versions
- name: Setup antelope-spring-dev & cdt versions
id: versions
env:
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: |
DEFAULTS_JSON=$(curl -sSfL $(gh api https://api.github.com/repos/${{github.repository}}/contents/.cicd/defaults.json?ref=${{github.sha}} --jq .download_url))
echo spring-dev-target=$(echo "$DEFAULTS_JSON" | jq -r '."spring-dev".target') >> $GITHUB_OUTPUT
echo spring-dev-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."spring-dev".prerelease') >> $GITHUB_OUTPUT
echo antelope-spring-dev-target=$(echo "$DEFAULTS_JSON" | jq -r '."antelope-spring-dev".target') >> $GITHUB_OUTPUT
echo antelope-spring-dev-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '."antelope-spring-dev".prerelease') >> $GITHUB_OUTPUT
echo cdt-target=$(echo "$DEFAULTS_JSON" | jq -r '.cdt.target') >> $GITHUB_OUTPUT
echo cdt-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '.cdt.prerelease') >> $GITHUB_OUTPUT
if [[ "${{inputs.override-spring-dev}}" != "" ]]; then
echo spring-dev-target=${{inputs.override-spring-dev}} >> $GITHUB_OUTPUT
if [[ "${{inputs.override-antelope-spring-dev}}" != "" ]]; then
echo antelope-spring-dev-target=${{inputs.override-antelope-spring-dev}} >> $GITHUB_OUTPUT
fi
if [[ "${{inputs.override-spring-dev-prerelease}}" == +(true|false) ]]; then
echo spring-dev-prerelease=${{inputs.override-spring-dev-prerelease}} >> $GITHUB_OUTPUT
if [[ "${{inputs.override-antelope-spring-dev-prerelease}}" == +(true|false) ]]; then
echo antelope-spring-dev-prerelease=${{inputs.override-antelope-spring-dev-prerelease}} >> $GITHUB_OUTPUT
fi
if [[ "${{inputs.override-cdt}}" != "" ]]; then
echo cdt-target=${{inputs.override-cdt}} >> $GITHUB_OUTPUT
Expand All @@ -70,16 +70,16 @@ jobs:
target: '${{steps.versions.outputs.cdt-target}}'
prereleases: ${{fromJSON(steps.versions.outputs.cdt-prerelease)}}
artifact-name: cdt_ubuntu_package_amd64
- name: Download spring-dev
- name: Download antelope-spring-dev
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: spring
file: 'spring-dev.*ubuntu22\.04_amd64.deb'
target: '${{steps.versions.outputs.spring-dev-target}}'
prereleases: ${{fromJSON(steps.versions.outputs.spring-dev-prerelease)}}
artifact-name: spring-dev-ubuntu22-amd64
container-package: experimental-binaries
file: 'antelope-spring-dev.*ubuntu22\.04_amd64.deb'
target: '${{steps.versions.outputs.antelope-spring-dev-target}}'
prereleases: ${{fromJSON(steps.versions.outputs.antelope-spring-dev-prerelease)}}
artifact-name: antelope-spring-dev-ubuntu22-amd64
container-package: antelope-spring-experimental-binaries
- name: Install packages
run: |
sudo apt-get update && sudo apt-get upgrade -y
Expand Down

0 comments on commit ea167cf

Please sign in to comment.