Skip to content

Commit 767b348

Browse files
authored
Merge pull request #1178 from AntelopeIO/switch_to_eos_system_contracts
Switch to using `eos-system-contracts` in libtester tests
2 parents be73a68 + 874bbc6 commit 767b348

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.cicd/defaults.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"target":"4.1",
44
"prerelease":true
55
},
6-
"referencecontracts":{
6+
"eossystemcontracts":{
77
"ref":"main"
88
}
99
}

.github/workflows/build.yaml

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ on:
1818
- default
1919
- true
2020
- false
21-
override-reference-contracts:
22-
description: 'Override reference contracts ref'
21+
override-eos-system-contracts:
22+
description: 'Override eos-system-contracts ref'
2323
type: string
2424

2525
permissions:
@@ -57,26 +57,26 @@ jobs:
5757
outputs:
5858
cdt-target: ${{steps.versions.outputs.cdt-target}}
5959
cdt-prerelease: ${{steps.versions.outputs.cdt-prerelease}}
60-
reference-contracts-ref: ${{steps.versions.outputs.reference-contracts-ref}}
60+
eos-system-contracts-ref: ${{steps.versions.outputs.eos-system-contracts-ref}}
6161
steps:
62-
- name: Setup cdt and reference-contracts versions
62+
- name: Setup cdt and eos-system-contracts versions
6363
id: versions
6464
env:
6565
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
6666
run: |
6767
DEFAULTS_JSON=$(curl -sSfL $(gh api https://api.github.com/repos/${{github.repository}}/contents/.cicd/defaults.json?ref=${{github.sha}} --jq .download_url))
6868
echo cdt-target=$(echo "$DEFAULTS_JSON" | jq -r '.cdt.target') >> $GITHUB_OUTPUT
6969
echo cdt-prerelease=$(echo "$DEFAULTS_JSON" | jq -r '.cdt.prerelease') >> $GITHUB_OUTPUT
70-
echo reference-contracts-ref=$(echo "$DEFAULTS_JSON" | jq -r '.referencecontracts.ref') >> $GITHUB_OUTPUT
70+
echo eos-system-contracts-ref=$(echo "$DEFAULTS_JSON" | jq -r '.eossystemcontracts.ref') >> $GITHUB_OUTPUT
7171
7272
if [[ "${{inputs.override-cdt}}" != "" ]]; then
7373
echo cdt-target=${{inputs.override-cdt}} >> $GITHUB_OUTPUT
7474
fi
7575
if [[ "${{inputs.override-cdt-prerelease}}" == +(true|false) ]]; then
7676
echo cdt-prerelease=${{inputs.override-cdt-prerelease}} >> $GITHUB_OUTPUT
7777
fi
78-
if [[ "${{inputs.override-reference-contracts}}" != "" ]]; then
79-
echo reference-contracts-ref=${{inputs.override-reference-contracts}} >> $GITHUB_OUTPUT
78+
if [[ "${{inputs.override-eos-system-contracts}}" != "" ]]; then
79+
echo eos-system-contracts-ref=${{inputs.override-eos-system-contracts}} >> $GITHUB_OUTPUT
8080
fi
8181
8282
package:
@@ -328,21 +328,21 @@ jobs:
328328
rm ./*.deb
329329
330330
# Reference Contracts
331-
- name: checkout reference-contracts
331+
- name: checkout eos-system-contracts
332332
uses: actions/checkout@v4
333333
with:
334-
repository: AntelopeIO/reference-contracts
335-
path: reference-contracts
336-
ref: '${{needs.v.outputs.reference-contracts-ref}}'
334+
repository: eosnetworkfoundation/eos-system-contracts
335+
path: eos-system-contracts
336+
ref: '${{needs.v.outputs.eos-system-contracts-ref}}'
337337
- if: ${{ matrix.test == 'deb-install' }}
338-
name: Install reference-contracts deps
338+
name: Install eos-system-contracts deps
339339
run: |
340340
apt-get -y install cmake build-essential
341-
- name: Build & Test reference-contracts
341+
- name: Build & Test eos-system-contracts
342342
run: |
343-
cmake -S reference-contracts -B reference-contracts/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=On -DSYSTEM_ENABLE_SPRING_VERSION_CHECK=Off -DSYSTEM_ENABLE_CDT_VERSION_CHECK=Off
344-
cmake --build reference-contracts/build -- -j $(nproc)
345-
cd reference-contracts/build/tests
343+
cmake -S eos-system-contracts -B eos-system-contracts/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=On -DSYSTEM_ENABLE_SPRING_VERSION_CHECK=Off -DSYSTEM_ENABLE_CDT_VERSION_CHECK=Off
344+
cmake --build eos-system-contracts/build -- -j $(nproc)
345+
cd eos-system-contracts/build/tests
346346
ctest --output-on-failure -j $(nproc)
347347
348348
all-passing:

0 commit comments

Comments
 (0)