Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker-compose from make_release.sh #2404

Merged
merged 1 commit into from
Dec 18, 2020

Conversation

piotr-iohk
Copy link
Contributor

Issue Number

#2398

Overview

  • e02d604
    Update docker-compose from make_release.sh

Comments

@piotr-iohk piotr-iohk added the IMPROVEMENT Mark a PR as an improvement, for auto-generated CHANGELOG label Dec 18, 2020
@piotr-iohk piotr-iohk requested a review from rvl December 18, 2020 09:46
@piotr-iohk piotr-iohk self-assigned this Dec 18, 2020
Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea

@@ -38,11 +38,15 @@ WIKI_COMMIT=$(git ls-remote https://github.com/$REPO.wiki.git HEAD | cut -f1)
echo ""
echo "Replacing $OLD_CABAL_VERSION with $CABAL_VERSION"
sed -i "s/$OLD_CABAL_VERSION/$CABAL_VERSION/" \
$(git ls-files '*.nix:!:nix/migration-tests.nix'; git ls-files '*.cabal'; git ls-files '*swagger.yaml')
$(git ls-files '*.nix:!:nix/migration-tests.nix'; git ls-files '*.cabal'; git ls-files '*swagger.yaml'; git ls-files 'docker-compose.yml')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$(git ls-files '*.nix:!:nix/migration-tests.nix'; git ls-files '*.cabal'; git ls-files '*swagger.yaml'; git ls-files 'docker-compose.yml')
$(git ls-files '*.nix:!:nix/migration-tests.nix'; git ls-files '*.cabal'; git ls-files '*swagger.yaml') docker-compose.yml

echo "Looking for remaining references to old version:"
git grep $OLD_CABAL_VERSION
echo ""

echo "Updating docker-compose.yml with $CARDANO_NODE_TAG cardano-node tag"
sed -i "s/$OLD_CARDANO_NODE_TAG/$CARDANO_NODE_TAG/" docker-compose.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way you don't need the old tag -

Suggested change
sed -i "s/$OLD_CARDANO_NODE_TAG/$CARDANO_NODE_TAG/" docker-compose.yml
sed -i "s|inputoutput/cardano-node:.*|inputoutput/cardano-node:$CARDANO_NODE_TAG|" docker-compose.yml

@piotr-iohk piotr-iohk force-pushed the piotr/update-docker-compose-on-release branch from e02d604 to 5fed606 Compare December 18, 2020 13:39
@piotr-iohk piotr-iohk force-pushed the piotr/update-docker-compose-on-release branch from 5fed606 to 058bc14 Compare December 18, 2020 13:40
@piotr-iohk
Copy link
Contributor Author

Thanks @rvl. Fixed.

@piotr-iohk
Copy link
Contributor Author

bors r+

iohk-bors bot added a commit that referenced this pull request Dec 18, 2020
2404: Update docker-compose from make_release.sh r=piotr-iohk a=piotr-iohk

# Issue Number

#2398


# Overview

- e02d604
  Update docker-compose from make_release.sh


# Comments




Co-authored-by: Piotr Stachyra <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 18, 2020

Build failed:

  rollback
      Can rollback to any arbitrary known checkpoint
        +++ OK, passed 100 tests.
      Correctly re-construct tx history on rollbacks
        +++ OK, passed 1600 tests:
        56.12% rolling back something

        43.88% Outgoing tx after point: 0
        21.75% Outgoing tx after point: 1
        14.31% Outgoing tx after point: 2
         7.69% Outgoing tx after point: 3
building of '/nix/store/d8sdzc2dvagzrxbfzxml7m1lpd4qvwgs-cardano-wallet-core-test-unit-2020.12.8-check' timed out after 900 seconds of silence

#2394

@piotr-iohk
Copy link
Contributor Author

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 18, 2020

Build succeeded:

@iohk-bors iohk-bors bot merged commit 8b16de6 into master Dec 18, 2020
@iohk-bors iohk-bors bot deleted the piotr/update-docker-compose-on-release branch December 18, 2020 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
IMPROVEMENT Mark a PR as an improvement, for auto-generated CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants