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

Bugfix: add "session" as optional CLI arg #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

willbamford
Copy link

@willbamford willbamford commented Jan 10, 2017

Without this change https://github.com/yegor256/dynamo-archive/blob/master/lib/utils.js#L27 will never pickup opts.session

@willbamford willbamford changed the title Bug: add "session" as optional CLI arg Bugfix: add "session" as optional CLI arg Jan 10, 2017
@willbamford
Copy link
Author

Hi @yegor256, not sure why CI build is failing - tests pass for me locally.

@yegor256
Copy link
Owner

yegor256 commented Jul 3, 2019

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Jul 3, 2019

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Collaborator

rultor commented Jul 3, 2019

@rultor merge

@willbamford @yegor256 Oops, I failed. You can see the full log here (spent 2min)

There is NO WARRANTY, to the extent permitted by law.

Home: ~/.gnupg
Supported algorithms:
Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
        CAMELLIA128, CAMELLIA192, CAMELLIA256
Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
Compression: Uncompressed, ZIP, ZLIB, BZIP2
++ pwd
++ pwd
+ gpg --verbose --keyring=/tmp/rultor-3J9D/.gpg/pubring.gpg --secret-keyring=/tmp/rultor-3J9D/.gpg/secring.gpg --decrypt repo/npmrc.asc
gpg: armor header: Version: GnuPG v1
gpg: public key is 9A839C3A
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: encrypted with 2048-bit RSA key, ID 9A839C3A, created 2014-08-17
      "Rultor.com <gpg@rultor.com>"
gpg: AES256 encrypted data
gpg: original file name='npmrc.enc'
+ gpg --no-tty --batch --verbose --decrypt --passphrase rultor-key:yegor256/dynamo-archive npmrc.enc
gpg: armor header: Version: GnuPG v1
gpg: CAST5 encrypted data
gpg: gpg-agent is not available in this session
gpg: encrypted with 1 passphrase
gpg: original file name='npmrc'
gpg: WARNING: message was not integrity protected
+ rm -rf npmrc.enc
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:willbamford/dynamo-archive.git
+ git remote update
Fetching origin
Fetching fork
From github.com:willbamford/dynamo-archive
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/master
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch master from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging bin/dynamo-archive.js
CONFLICT (content): Merge conflict in bin/dynamo-archive.js
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants