Compare commits
5 commits
master
...
test/hot-f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3991681860 | ||
|
|
0862697491 | ||
|
|
fbbd7c00b9 | ||
|
|
f08a36cca2 | ||
|
|
40aac3bafe |
3 changed files with 9 additions and 7 deletions
|
|
@ -105,14 +105,13 @@ test-testnet:
|
||||||
|
|
||||||
dockerize-testnet:
|
dockerize-testnet:
|
||||||
stage: dockerize
|
stage: dockerize
|
||||||
dependencies:
|
|
||||||
- test-testnet
|
|
||||||
variables:
|
variables:
|
||||||
IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
|
IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
|
||||||
before_script:
|
before_script:
|
||||||
- docker info
|
- docker info
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
|
- ls -a
|
||||||
- docker build --no-cache -t $IMAGE .
|
- docker build --no-cache -t $IMAGE .
|
||||||
- docker push $IMAGE
|
- docker push $IMAGE
|
||||||
after_script:
|
after_script:
|
||||||
|
|
|
||||||
|
|
@ -96,9 +96,9 @@ WORKDIR /home/peerplays/
|
||||||
# git clone https://gitlab.com/PBSA/peerplays.git && \
|
# git clone https://gitlab.com/PBSA/peerplays.git && \
|
||||||
# cd peerplays && \
|
# cd peerplays && \
|
||||||
# git checkout develop && \
|
# git checkout develop && \
|
||||||
# git submodule update --init --recursive && \
|
# git submodule update --init --recursive && \
|
||||||
# git branch --show-current && \
|
# git branch --show-current && \
|
||||||
# git log --oneline -n 5
|
# git log --oneline -n 5
|
||||||
|
|
||||||
# Add local source
|
# Add local source
|
||||||
ADD . peerplays
|
ADD . peerplays
|
||||||
|
|
@ -106,6 +106,9 @@ ADD . peerplays
|
||||||
# Configure Peerplays
|
# Configure Peerplays
|
||||||
RUN \
|
RUN \
|
||||||
cd peerplays && \
|
cd peerplays && \
|
||||||
|
git submodule update --init --recursive && \
|
||||||
|
git branch --show-current && \
|
||||||
|
git log --oneline -n 5
|
||||||
mkdir build && \
|
mkdir build && \
|
||||||
cd build && \
|
cd build && \
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release ..
|
cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef HARDFORK_SIDECHAIN_DELETE_TIME
|
#ifndef HARDFORK_SIDECHAIN_DELETE_TIME
|
||||||
#ifdef BUILD_PEERPLAYS_TESTNET
|
#ifdef BUILD_PEERPLAYS_TESTNET
|
||||||
#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
|
#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-06T02:00:00"))
|
||||||
#else
|
#else
|
||||||
#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
|
#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-06T02:00:00"))
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue