Skip to content

Commit

Permalink
Merge pull request #39 from AntelopeIO/ubuntu22_libtester5
Browse files Browse the repository at this point in the history
update CI to use Ubuntu 22.04 and libtester 5.0 by default, plus update some actions versions
  • Loading branch information
spoonincode authored Jan 6, 2024
2 parents 10bab0c + 58d7984 commit 7e4fa3a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .cicd/defaults.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"leap-dev":{
"target":"3",
"target":"5",
"prerelease":false
},
"cdt":{
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defaults:
jobs:
build-test:
name: Build & Test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Setup leap-dev & cdt versions
id: versions
Expand All @@ -62,32 +62,30 @@ jobs:
echo cdt-prerelease=${{inputs.override-cdt-prerelease}} >> $GITHUB_OUTPUT
fi
- name: Download cdt
uses: AntelopeIO/asset-artifact-download-action@v2
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: cdt
file: 'cdt_.*amd64.deb'
target: '${{steps.versions.outputs.cdt-target}}'
prereleases: ${{fromJSON(steps.versions.outputs.cdt-prerelease)}}
artifact-name: cdt_ubuntu_package_amd64
token: ${{github.token}}
- name: Download leap-dev
uses: AntelopeIO/asset-artifact-download-action@v2
uses: AntelopeIO/asset-artifact-download-action@v3
with:
owner: AntelopeIO
repo: leap
file: 'leap-dev.*(x86_64|amd64).deb'
file: 'leap-dev.*ubuntu22\.04_amd64.deb'
target: '${{steps.versions.outputs.leap-dev-target}}'
prereleases: ${{fromJSON(steps.versions.outputs.leap-dev-prerelease)}}
artifact-name: leap-dev-ubuntu20-amd64
artifact-name: leap-dev-ubuntu22-amd64
container-package: experimental-binaries
token: ${{github.token}}
- name: Install packages
run: |
sudo apt install ./*.deb
sudo apt-get install cmake
rm ./*.deb
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src
- name: Build & Test
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)

set(EOSIO_VERSION_MIN "3.1")
set(EOSIO_VERSION_SOFT_MAX "4.1")
set(EOSIO_VERSION_SOFT_MAX "5.0")
# set(EOSIO_VERSION_HARD_MAX "")

find_package(leap)
Expand Down

0 comments on commit 7e4fa3a

Please sign in to comment.