diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cda41654..70d3c97d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,14 +105,13 @@ test-testnet: dockerize-testnet: stage: dockerize - dependencies: - - test-testnet variables: IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA before_script: - docker info - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: + - ls -a - docker build --no-cache -t $IMAGE . - docker push $IMAGE after_script: diff --git a/Dockerfile b/Dockerfile index 7a76c136..4c27b84f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,9 +96,9 @@ WORKDIR /home/peerplays/ # git clone https://gitlab.com/PBSA/peerplays.git && \ # cd peerplays && \ # git checkout develop && \ -# git submodule update --init --recursive && \ -# git branch --show-current && \ -# git log --oneline -n 5 +# git submodule update --init --recursive && \ +# git branch --show-current && \ +# git log --oneline -n 5 # Add local source ADD . peerplays @@ -106,6 +106,9 @@ ADD . peerplays # Configure Peerplays RUN \ cd peerplays && \ + git submodule update --init --recursive && \ + git branch --show-current && \ + git log --oneline -n 5 mkdir build && \ cd build && \ cmake -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/chain/hardfork.d/SIDECHAIN.hf b/libraries/chain/hardfork.d/SIDECHAIN.hf index 3a0a3990..435a3315 100644 --- a/libraries/chain/hardfork.d/SIDECHAIN.hf +++ b/libraries/chain/hardfork.d/SIDECHAIN.hf @@ -1,7 +1,7 @@ #ifndef HARDFORK_SIDECHAIN_DELETE_TIME #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 -#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