Skip to content

Commit

Permalink
spring rebrand
Browse files Browse the repository at this point in the history
  • Loading branch information
spoonincode committed Apr 18, 2024
1 parent bef48a2 commit 7a5a807
Show file tree
Hide file tree
Showing 65 changed files with 253 additions and 390 deletions.
4 changes: 2 additions & 2 deletions .cicd/platforms/asan.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ RUN apt-get update && apt-get upgrade -y && \

RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh 18

#make sure no confusion on what llvm library leap's cmake should pick up on
#make sure no confusion on what llvm library spring's cmake should pick up on
RUN rm -rf /usr/lib/llvm-18/lib/cmake

ENV LEAP_PLATFORM_HAS_EXTRAS_CMAKE=1
ENV SPRING_PLATFORM_HAS_EXTRAS_CMAKE=1
COPY <<-EOF /extras.cmake
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)

Expand Down
4 changes: 2 additions & 2 deletions .cicd/platforms/asserton.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ RUN apt-get update && apt-get upgrade -y && \
zlib1g-dev \
zstd

ENV LEAP_PLATFORM_HAS_EXTRAS_CMAKE=1
ENV SPRING_PLATFORM_HAS_EXTRAS_CMAKE=1
COPY <<-EOF /extras.cmake
# reset the build type to empty to disable any cmake default flags
set(CMAKE_BUILD_TYPE "" CACHE STRING "" FORCE)

set(CMAKE_C_FLAGS "-O3" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-O3" CACHE STRING "")

set(LEAP_ENABLE_RELEASE_BUILD_TEST "Off" CACHE BOOL "")
set(SPRING_ENABLE_RELEASE_BUILD_TEST "Off" CACHE BOOL "")
EOF
4 changes: 2 additions & 2 deletions .cicd/platforms/ubsan.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ RUN apt-get update && apt-get upgrade -y && \

RUN yes | bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm.sh 18

#make sure no confusion on what llvm library leap's cmake should pick up on
#make sure no confusion on what llvm library spring's cmake should pick up on
RUN rm -rf /usr/lib/llvm-18/lib/cmake

COPY <<-EOF /ubsan.supp
vptr:wasm_eosio_validation.hpp
vptr:wasm_eosio_injection.hpp
EOF

ENV LEAP_PLATFORM_HAS_EXTRAS_CMAKE=1
ENV SPRING_PLATFORM_HAS_EXTRAS_CMAKE=1
COPY <<-EOF /extras.cmake
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE)

Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ jobs:
zstdcat build.tar.zst | tar x
cd build
cpack
../tools/tweak-deb.sh leap_*.deb
../tools/tweak-deb.sh spring_*.deb
- name: Install dev package
if: matrix.platform != 'reproducible'
run: |
apt-get update && apt-get upgrade -y
apt-get install -y ./build/leap_*.deb ./build/leap-dev*.deb
apt-get install -y ./build/spring_*.deb ./build/spring-dev*.deb
- name: Test using TestHarness
if: matrix.platform != 'reproducible'
run: |
Expand All @@ -115,15 +115,15 @@ jobs:
uses: actions/upload-artifact@v4
if: matrix.platform != 'reproducible'
with:
name: leap-dev-${{matrix.platform}}-amd64
path: build/leap-dev*.deb
name: spring-dev-${{matrix.platform}}-amd64
path: build/spring-dev*.deb
compression-level: 0
- name: Upload leap package
- name: Upload spring package
uses: actions/upload-artifact@v4
if: matrix.platform == 'reproducible'
with:
name: leap-deb-amd64
path: build/leap_*.deb
name: spring-deb-amd64
path: build/spring_*.deb
compression-level: 0

tests:
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
uses: ./.github/actions/parallel-ctest-containers
with:
container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.cfg.base].image}}
error-log-paths: '["build/etc", "build/var", "build/leap-ignition-wd", "build/TestLogs"]'
error-log-paths: '["build/etc", "build/var", "build/spring-ignition-wd", "build/TestLogs"]'
log-tarball-prefix: ${{matrix.cfg.name}}
tests-label: nonparallelizable_tests
test-timeout: 420
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
uses: ./.github/actions/parallel-ctest-containers
with:
container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.cfg.base].image}}
error-log-paths: '["build/etc", "build/var", "build/leap-ignition-wd", "build/TestLogs"]'
error-log-paths: '["build/etc", "build/var", "build/spring-ignition-wd", "build/TestLogs"]'
log-tarball-prefix: ${{matrix.cfg.name}}
tests-label: long_running_tests
test-timeout: 1800
Expand Down Expand Up @@ -269,41 +269,41 @@ jobs:
apt-get update
apt-get upgrade -y
# LEAP
# spring
- if: ${{ matrix.test != 'deb-install' }}
name: Clone leap
name: Clone spring
uses: actions/checkout@v4
with:
submodules: recursive
- if: ${{ matrix.test != 'deb-install' }}
name: Download leap builddir
name: Download spring builddir
uses: actions/download-artifact@v4
with:
name: ${{matrix.platform}}-build
- if: ${{ matrix.test != 'deb-install' }}
name: Extract leap build
name: Extract spring build
run: |
zstdcat build.tar.zst | tar x
- if: ${{ matrix.test == 'build-tree' }}
name: Set leap_DIR env var
run: |
echo "leap_DIR=$PWD/build/lib/cmake/leap" >> "$GITHUB_ENV"
- if: ${{ matrix.test == 'make-dev-install' }}
name: leap dev-install
name: spring dev-install
run: |
cmake --install build
cmake --install build --component dev
- if: ${{ matrix.test == 'make-dev-install' }}
name: Delete leap artifacts
name: Delete spring artifacts
run: |
rm -r *
- if: ${{ matrix.test == 'deb-install' }}
name: Download leap-dev
name: Download spring-dev
uses: actions/download-artifact@v4
with:
name: leap-dev-${{matrix.platform}}-amd64
name: spring-dev-${{matrix.platform}}-amd64
- if: ${{ matrix.test == 'deb-install' }}
name: Install leap-dev Package
name: Install spring-dev Package
run: |
apt-get install -y ./*.deb
rm ./*.deb
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_base.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build leap"
name: "Build spring"

on:
workflow_call:
Expand All @@ -22,7 +22,7 @@ defaults:

jobs:
Build:
name: Build leap
name: Build spring
strategy:
fail-fast: false
matrix:
Expand All @@ -38,7 +38,7 @@ jobs:
run: |
# https://github.com/actions/runner/issues/2033
chown -R $(id -u):$(id -g) $PWD
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_LEAP_DEV_DEB=On ${LEAP_PLATFORM_HAS_EXTRAS_CMAKE:+-C /extras.cmake} -GNinja
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SPRING_DEV_DEB=On ${SPRING_PLATFORM_HAS_EXTRAS_CMAKE:+-C /extras.cmake} -GNinja
cmake --build build
tar -pc --exclude "*.o" build | zstd --long -T0 -9 > build.tar.zst
- name: Upload builddir
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/performance_harness_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ on:
override-test-params:
description: 'Override perf harness params'
type: string
override-leap:
description: Override leap target
override-spring:
description: Override spring target
type: string
override-leap-prerelease:
override-spring-prerelease:
type: choice
description: Override leap prelease
description: Override spring prelease
options:
- default
- true
Expand All @@ -38,24 +38,24 @@ jobs:
runs-on: ubuntu-latest
outputs:
test-params: ${{steps.overrides.outputs.test-params}}
leap-target: ${{steps.overrides.outputs.leap-target}}
leap-prerelease: ${{steps.overrides.outputs.leap-prerelease}}
spring-target: ${{steps.overrides.outputs.spring-target}}
spring-prerelease: ${{steps.overrides.outputs.spring-prerelease}}
steps:
- name: Setup Input Params
id: overrides
run: |
echo test-params=findMax testBpOpMode >> $GITHUB_OUTPUT
echo leap-target="DEFAULT" >> $GITHUB_OUTPUT
echo leap-prerelease="false" >> $GITHUB_OUTPUT
echo spring-target="DEFAULT" >> $GITHUB_OUTPUT
echo spring-prerelease="false" >> $GITHUB_OUTPUT
if [[ "${{inputs.override-test-params}}" != "" ]]; then
echo test-params=${{inputs.override-test-params}} >> $GITHUB_OUTPUT
fi
if [[ "${{inputs.override-leap}}" != "" ]]; then
echo leap-target=${{inputs.override-leap}} >> $GITHUB_OUTPUT
if [[ "${{inputs.override-spring}}" != "" ]]; then
echo spring-target=${{inputs.override-spring}} >> $GITHUB_OUTPUT
fi
if [[ "${{inputs.override-leap-prerelease}}" == +(true|false) ]]; then
echo leap-prerelease=${{inputs.override-leap-prerelease}} >> $GITHUB_OUTPUT
if [[ "${{inputs.override-spring-prerelease}}" == +(true|false) ]]; then
echo spring-prerelease=${{inputs.override-spring-prerelease}} >> $GITHUB_OUTPUT
fi
platform-cache:
Expand All @@ -69,7 +69,7 @@ jobs:
platform-files: .cicd/platforms

reuse-build:
name: Reuse leap build
name: Reuse spring build
needs: [v]
runs-on: ubuntu-latest
outputs:
Expand All @@ -80,7 +80,7 @@ jobs:
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: leap
repo: spring
file: build.tar.zst
target: ${{github.sha}}
artifact-name: ${{github.event.inputs.platform-choice}}-build
Expand Down Expand Up @@ -117,20 +117,20 @@ jobs:
- name: Extract Build Directory
run: |
zstdcat build.tar.zst | tar x
- if: ${{ needs.v.outputs.leap-target != 'DEFAULT' }}
name: Download Prev Leap Version
- if: ${{ needs.v.outputs.spring-target != 'DEFAULT' }}
name: Download Prev Spring Version
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: leap
target: '${{needs.v.outputs.leap-target}}'
prereleases: ${{fromJSON(needs.v.outputs.leap-prerelease)}}
file: 'leap.*${{github.event.inputs.platform-choice}}.*(x86_64|amd64).deb'
- if: ${{ needs.v.outputs.leap-target != 'DEFAULT' }}
name: Install leap & replace binaries for PH use
repo: spring
target: '${{needs.v.outputs.spring-target}}'
prereleases: ${{fromJSON(needs.v.outputs.spring-prerelease)}}
file: 'spring.*${{github.event.inputs.platform-choice}}.*(x86_64|amd64).deb'
- if: ${{ needs.v.outputs.spring-target != 'DEFAULT' }}
name: Install spring & replace binaries for PH use
run: |
apt-get update
apt-get install -y ./leap*.deb
apt-get install -y ./spring*.deb
rm build/bin/nodeos
rm build/bin/cleos
cp /usr/bin/nodeos build/bin
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ jobs:
packages: write
actions: read
steps:
- name: Get ubuntu20 leap-dev.deb
- name: Get ubuntu20 spring-dev.deb
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: ${{github.repository_owner}}
repo: ${{github.event.repository.name}}
file: 'leap-dev.*amd64.deb'
file: 'spring-dev.*amd64.deb'
target: ${{github.sha}}
artifact-name: leap-dev-ubuntu20-amd64
artifact-name: spring-dev-ubuntu20-amd64
wait-for-exact-target: true
- name: Get ubuntu22 leap-dev.deb
- name: Get ubuntu22 spring-dev.deb
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: ${{github.repository_owner}}
repo: ${{github.event.repository.name}}
file: 'leap-dev.*amd64.deb'
file: 'spring-dev.*amd64.deb'
target: ${{github.sha}}
artifact-name: leap-dev-ubuntu22-amd64
artifact-name: spring-dev-ubuntu22-amd64
wait-for-exact-target: true
- name: Create Dockerfile
run: |
cat <<EOF > Dockerfile
FROM scratch
LABEL org.opencontainers.image.description="A collection of experimental Leap binary packages"
LABEL org.opencontainers.image.description="A collection of experimental Leap and Spring binary packages"
COPY *.deb /
EOF
- name: Login to ghcr
Expand Down
Loading

0 comments on commit 7a5a807

Please sign in to comment.