From e6290afd3e791e88abb72ae6174925793a7369a3 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 30 Apr 2019 11:32:08 +0200 Subject: [PATCH 01/16] added simsala --- .circleci/config.yml | 25 +++---------------------- CHANGELOG.md | 2 +- package.json | 5 +++-- yarn.lock | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e3112f87d2..c02d305974 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,28 +230,9 @@ jobs: steps: - checkout - yarn-install - - run: node tasks/createReleasePR.js - - # Publish the release to GitHub. - publish: - executor: node - steps: - - checkout - - yarn-install - - run: - command: | - mostRecentTag=$(git describe --abbrev=0 --tags) - - if [ $mostRecentTag = release-candidate ]; then - set -o verbose - - # Delete the tag before testing the build in case it fails. - git remote add bot https://${GIT_BOT_TOKEN}@github.com/cosmos/voyager.git - git tag -d release-candidate - git push --delete bot release-candidate - - node tasks/publish.js - fi + - run: simsala release --pending-path ./changes + - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} + # Push merges to master immediatly back to develop to stay in sync mergeBack: executor: node diff --git a/CHANGELOG.md b/CHANGELOG.md index c0a3577819..f7303df057 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] + ## [1.0.0-beta.51] - 2019-04-28 diff --git a/package.json b/package.json index 1c8a5efe3d..1219907b15 100644 --- a/package.json +++ b/package.json @@ -28,14 +28,14 @@ "test:e2e": "nightwatch --config ./test/e2e/nightwatch.conf.js", "test:exe": "node tasks/test-build.js", "test:coverage": "http-server test/unit/coverage/lcov-report", - "release": "git checkout develop & git pull & git push origin develop:release", "postcheckout": "yarn", "watch": "tasks/watch.sh", "testnet": "docker-compose -f ./tasks/local-testnet/docker-compose.yml up", "proxy": "node ./tasks/local-testnet/proxy.js", "certificates": "docker-compose -f tasks/certificates/docker-compose.yml up", "frontend": "cross-env NODE_ENV=development FAUCET='http://localhost:8080' webpack-dev-server --hot --colors --config webpack.renderer.config.js --port 9080 --content-base app/dist --https --mode=development --cert 'certs/dev.crt' --key 'certs/dev.key'", - "changelog": "node tasks/changelog.js" + "changelog": "simsala log --pending-path ./changes", + "release": "git checkout develop & git pull & git push origin develop:release" }, "devDependencies": { "@babel/node": "7.2.2", @@ -89,6 +89,7 @@ "postcss-preset-env": "6.6.0", "prettier": "1.17.0", "publish-release": "1.6.0", + "simsala": "0.0.6", "style-loader": "0.23.1", "stylelint": "9.10.1", "stylelint-config-standard": "18.2.0", diff --git a/yarn.lock b/yarn.lock index a36d8f337f..7e2bcde51e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1620,7 +1620,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -axios@0.18.0: +axios@0.18.0, axios@^0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI= @@ -2639,7 +2639,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0: +commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -9992,6 +9992,16 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" +simsala@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/simsala/-/simsala-0.0.6.tgz#eed53c62399d252be6d50e3e31089cf0ec4ee300" + integrity sha512-zJC0BB9O6r4g01X3o76KeVAToF64MnycmFJxmQKQn7zWSKmYM6wrsc7zosuLfwF+yw1Hsf4ikDA85tIB2COEMA== + dependencies: + axios "^0.18.0" + commander "^2.20.0" + inquirer "^6.2.2" + semver "^6.0.0" + single-line-log@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-0.4.1.tgz#87a55649f749d783ec0dcd804e8140d9873c7cee" From b39cda9245f9c7490a9062e568d33ca1621bb3c5 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 16 May 2019 22:01:55 +0200 Subject: [PATCH 02/16] readd publish step --- .circleci/config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c02d305974..6f65f16d11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -246,6 +246,26 @@ jobs: git merge origin/master git push + # Publish the release to GitHub. + publish: + executor: node + steps: + - checkout + - yarn-install + - run: + command: | + mostRecentTag=$(git describe --abbrev=0 --tags) + + if [ $mostRecentTag = release-candidate ]; then + set -o verbose + + # Delete the tag before testing the build in case it fails. + git remote add bot https://${GIT_BOT_TOKEN}@github.com/cosmos/voyager.git + git tag -d release-candidate + git push --delete bot release-candidate + + node tasks/publish.js + workflows: version: 2 From 17b586dc8387ef00809f9dd40c303645efd25893 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 16 May 2019 22:26:15 +0200 Subject: [PATCH 03/16] updated to version 0.0.7 --- .circleci/config.yml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc0d6b8919..aa697c2b51 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,6 @@ jobs: steps: - checkout - yarn-install - - run: simsala release --pending-path ./changes - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} # Push merges to master immediatly back to develop to stay in sync diff --git a/package.json b/package.json index cf6f6b13e1..1ed4964f73 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "postcss-preset-env": "6.6.0", "prettier": "1.17.0", "publish-release": "1.6.0", - "simsala": "0.0.6", + "simsala": "0.0.7", "style-loader": "0.23.1", "stylelint": "9.10.1", "stylelint-config-standard": "18.2.0", From 193ef8200df01ec5e834011a7510e7f64c39ce64 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 16 May 2019 22:27:19 +0200 Subject: [PATCH 04/16] removed dead code --- tasks/changelog.js | 113 ----------- tasks/createReleasePR.js | 177 ------------------ test/unit/specs/tasks/createReleasePR.spec.js | 146 --------------- 3 files changed, 436 deletions(-) delete mode 100644 tasks/changelog.js delete mode 100644 tasks/createReleasePR.js delete mode 100644 test/unit/specs/tasks/createReleasePR.spec.js diff --git a/tasks/changelog.js b/tasks/changelog.js deleted file mode 100644 index 52cb2c362b..0000000000 --- a/tasks/changelog.js +++ /dev/null @@ -1,113 +0,0 @@ -const fs = require(`fs`) -const { promisify } = require(`util`) -const { join } = require(`path`) -const exec = promisify(require(`child_process`).exec) -const inquirer = require(`inquirer`) - -const changes = [] - -const ask = async () => { - const answer = await inquirer.prompt([ - { - type: `list`, - name: `type`, - message: `What type of change do you want to add to the changelog?`, - choices: [ - { name: `Addition of feature`, value: `Added` }, - { name: `Change of existing behavior`, value: `Changed` }, - { name: `Fix for a bug`, value: `Fixed` }, - { name: `Security improvement`, value: `Security` }, - { name: `Deprecation of unused code/feature`, value: `Deprecated` } - ] - }, - { - type: `input`, - name: `content`, - message: `What is the content of the change?`, - validate: function(value) { - if (value) return true - - return `You need to specify the change.` - } - }, - { - type: `list`, - name: `referenceType`, - message: `(mandatory) Which GitHub reference has this?`, - choices: [ - { name: `Issue`, value: `issues` }, - { name: `Pull Request`, value: `pull` } - ] - }, - { - type: `input`, - name: `referenceId`, - message: `What is the id of the reference issue/PR on GitHub?`, - validate: function(value) { - if (value) return true - - return `You need to specify the GitHub reference.` - }, - transformer(input) { - return input.replace(`#`, ``) - } - }, - { - type: `input`, - name: `author`, - message: `What is your GitHub handle?`, - validate: function(value) { - if (value) return true - - return `You need to specify your GitHub handle.` - } - }, - { - type: `confirm`, - name: `askAgain`, - message: `Want to enter another change?`, - default: false - } - ]) - changes.push(answer) - if (answer.askAgain) { - await ask() - } -} - -async function main() { - await ask() - - const changelog = changes.reduce( - (changelog, { type, content, author, referenceType, referenceId }) => { - const referenceLink = `https://github.com/cosmos/lunie/${referenceType}/${referenceId}` - // eslint-disable-next-line no-useless-escape - changelog += `[${type}] [\#${referenceId}](${referenceLink}) ${content} @${author}\n` - return changelog - }, - `` - ) - - const branch = (await exec(`git rev-parse --abbrev-ref HEAD`)).stdout - .trim() - .replace(/\//g, `_`) - - const changesFolderPath = join(__dirname, `../changes`) - if (!fs.existsSync(changesFolderPath)) { - fs.mkdirSync(changesFolderPath) - } - const changeFileName = join(changesFolderPath, branch) - if (fs.existsSync(changeFileName)) { - fs.unlinkSync(changeFileName) - } - fs.writeFileSync(changeFileName, changelog.trim(), { - flag: `wx`, - encoding: `utf8` - }) - - // commit changelog - exec(`git add ${changeFileName}`) - exec(`git commit -m 'changelog' ${changeFileName}`) -} - -main() diff --git a/tasks/createReleasePR.js b/tasks/createReleasePR.js deleted file mode 100644 index 3e24ea8a7b..0000000000 --- a/tasks/createReleasePR.js +++ /dev/null @@ -1,177 +0,0 @@ -"use strict" - -const { cli, shell } = require(`@nodeguy/cli`) -const fs = require(`fs`) -const { join } = require(`path`) -const groupBy = require(`lodash.groupby`) -const octokit = require(`@octokit/rest`)() - -const changesPath = join(__dirname, `../changes`) - -function bumpVersion(versionString) { - const versionElements = versionString.split(`.`) - const patchVersionPosition = versionElements.length - 1 - versionElements[patchVersionPosition] = - parseInt(versionElements[patchVersionPosition]) + 1 - return versionElements.join(`.`) -} // only touches filesystem - -// collect all changes from files -/* istanbul ignore next */ async function collectPending() { - if (!fs.existsSync(changesPath)) { - throw new Error(`No pending changes.`) - } - const files = await fs.readdirSync(changesPath) - const allChanges = files.map(file => { - return fs.readFileSync(join(changesPath, file), `utf8`) - }) - - return allChanges -} - -function addCategory(output, category, groupedLines) { - if (groupedLines[category]) { - output += `### ${category}\n\n` - groupedLines[category].forEach( - ({ content }) => (output += `- ${content}\n`) - ) - output += `\n` - } - - return output -} - -// stitch all changes into one nice changelog -// changes is an array of the content from all individual changelogs -function beautifyChanges(changes) { - const lines = changes.join(`\n`).split(`\n`) - - const categorized = lines.map(line => { - const matches = /\[(\w+)\] (.+)/.exec(line) - return { - type: matches[1], - content: matches[2] - } - }) - const grouped = groupBy(categorized, `type`) - - let output = `` - output = addCategory(output, `Added`, grouped) - output = addCategory(output, `Changed`, grouped) - output = addCategory(output, `Fixed`, grouped) - output = addCategory(output, `Security`, grouped) - output = addCategory(output, `Deprecated`, grouped) - - return output.trim() -} - -function updateChangeLog(changeLog, pending, newVersion, now) { - const today = now.toISOString().slice(0, 10) - - return changeLog.replace( - `## [Unreleased]`, - `## [Unreleased]\n\n## [${newVersion}] - ${today}\n\n${pending}` - ) -} - -const updatePackageJson = (packageJson, version) => - Object.assign({}, packageJson, { version }) - -const pushCommit = (shell, { token, branch }) => - shell(` -set -o verbose -git config --local user.name "Voyager Bot" -git config --local user.email "voyager_bot@tendermint.com" -git add CHANGELOG.md changes/* package.json -git commit --message="Bump version for release." -git tag --force release-candidate -git remote add bot https://${token}@github.com/cosmos/voyager.git -git push --force --tags bot HEAD:${branch} -`) - -const recentChanges = changeLog => - changeLog.match(/.+?## .+?\n## .+?\n\n(.+?)\n## /s)[1] - -const createPullRequest = async (octokit, { changeLog, token, tag, head }) => { - octokit.authenticate({ - type: `token`, - token - }) - - await octokit.pullRequests.create({ - owner: `cosmos`, - repo: `voyager`, - title: `automatic release created for ${tag}`, - head, - base: `master`, - body: recentChanges(changeLog), - maintainer_can_modify: true - }) -} - -async function main({ octokit, shell, fs }, changeLog, pending, packageJson) { - // only update if sth changed - if (pending.trim() === ``) return - - console.log(`Making release...`) - - const oldVersion = packageJson.version - const newVersion = bumpVersion(oldVersion) - console.log(`New version:`, newVersion) - const newChangeLog = updateChangeLog( - changeLog, - pending, - newVersion, - new Date() - ) - const newPackageJson = updatePackageJson(packageJson, newVersion) - - fs.writeFileSync(join(__dirname, `..`, `PENDING.md`), ``, `utf8`) - fs.writeFileSync(join(__dirname, `..`, `CHANGELOG.md`), newChangeLog, `utf8`) - fs.writeFileSync( - join(__dirname, `..`, `package.json`), - JSON.stringify(newPackageJson, null, 2) + `\n`, - `utf8` - ) - - console.log(`--- Committing release changes ---`) - - const tag = `v${newVersion}` - const branch = `release-candidate/${tag}` - await pushCommit(shell, { token: process.env.GIT_BOT_TOKEN, branch }) - - await createPullRequest(octokit, { - changeLog: newChangeLog, - token: process.env.GIT_BOT_TOKEN, - tag, - head: branch - }) -} - -if (require.main === module) { - /* istanbul ignore next */ - cli({}, async () => { - const changeLog = fs.readFileSync( - join(__dirname, `..`, `CHANGELOG.md`), - `utf8` - ) - const pending = beautifyChanges(await collectPending()) - const packageJson = require(join(__dirname, `..`, `package.json`)) - - main({ octokit, shell, fs }, changeLog, pending, packageJson) - - // cleanup - const files = await fs.readdirSync(changesPath) - files.forEach(file => { - fs.unlinkSync(join(changesPath, file)) - }) - }) -} - -module.exports = { - main, - bumpVersion, - updateChangeLog, - updatePackageJson, - beautifyChanges -} diff --git a/test/unit/specs/tasks/createReleasePR.spec.js b/test/unit/specs/tasks/createReleasePR.spec.js deleted file mode 100644 index 3d4a9d0e7a..0000000000 --- a/test/unit/specs/tasks/createReleasePR.spec.js +++ /dev/null @@ -1,146 +0,0 @@ -"use strict" - -const release = require(`../../../../tasks/createReleasePR`) - -jest.mock(`@octokit/rest`, () => () => ({ - authenticate: () => {}, - pullRequests: { - create: () => {} - } -})) - -it(`bumps version`, () => { - expect(release.bumpVersion(`0.6.1`)).toEqual(`0.6.2`) -}) - -it(`updates CHANGELOG`, () => { - const previous = `# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - -## [Unreleased] - -## [0.6.1] - 2018-05-24 -` - - const pending = `### Added - -- xxx @faboweb - -### Changed - -- yyy @fedekunze` - - const newVersion = `0.6.2` - const now = new Date(`2018-05-25`) - - const updated = `# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - -## [Unreleased] - -## [0.6.2] - 2018-05-25 - -### Added - -- xxx @faboweb - -### Changed - -- yyy @fedekunze - -## [0.6.1] - 2018-05-24 -` - - expect(release.updateChangeLog(previous, pending, newVersion, now)).toEqual( - updated - ) -}) - -it(`updates package.json`, () => { - const previous = { - name: `cosmos-voyager`, - productName: `Cosmos Voyager`, - version: `0.6.1` - } - - const newVersion = `0.6.2` - - const updated = { - name: `cosmos-voyager`, - productName: `Cosmos Voyager`, - version: `0.6.2` - } - - expect(release.updatePackageJson(previous, newVersion)).toEqual(updated) -}) - -it(`creates release PR`, async () => { - const octokit = { - authenticate: () => {}, - pullRequests: { - create: jest.fn() - } - } - const shell = () => {} - const fs = { - writeFileSync: () => {} - } - await expect( - release.main( - { octokit, shell, fs }, - `\n\n## [Unreleased]\n\n## [0.6.1] - 2018-05-24`, - `XXX`, - { version: `0.0.1` } - ) - ).resolved - expect(octokit.pullRequests.create).toHaveBeenCalled() -}) - -it(`don't create PR if nothing changed`, () => { - const octokit = { - authenticate: () => {}, - pullRequests: { - create: jest.fn() - } - } - const shell = () => {} - const fs = { - writeFileSync: () => {} - } - expect( - release.main( - { octokit, shell, fs }, - `\n\n## [Unreleased]\n\n## [0.6.1] - 2018-05-24`, - ``, - { version: `0.0.1` } - ) - ).resolved - expect(octokit.pullRequests.create).not.toHaveBeenCalled() -}) - -it(`beautifys changes`, () => { - const pending = [ - `[Added] xxx @faboweb\n[Changed] yyy @fedekunze`, - `[Fixed] zzz @faboweb` - ] - const expected = `### Added - -- xxx @faboweb - -### Changed - -- yyy @fedekunze - -### Fixed - -- zzz @faboweb` - expect(release.beautifyChanges(pending)).toBe(expected) -}) From 1c4c040ef89f3342246266efcbe09f9f48ed8cb9 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:45:22 +0200 Subject: [PATCH 05/16] add message to release candidate --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa697c2b51..d3c48abfff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: steps: - checkout - yarn-install - - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} + - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master: here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From b1e1098c4c0a9527bb34afb7b61970149d65f5e6 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:45:57 +0200 Subject: [PATCH 06/16] test release message --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3c48abfff..c809826d1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,10 +348,10 @@ workflows: releaseManually: jobs: - release: - filters: - branches: - only: - - release + # filters: + # branches: + # only: + # - release mergeBack: jobs: - mergeBack: From 0713e51270b53bb3ff6feb9e1ff622699d9a2b89 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:47:27 +0200 Subject: [PATCH 07/16] fix circle --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c809826d1a..4bd784ff6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: steps: - checkout - yarn-install - - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master: here" + - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From ec722cfea85357bffe1380af9646dec2e2883da7 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:48:18 +0200 Subject: [PATCH 08/16] fix circle --- .circleci/config.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bd784ff6e..ab4ab15ced 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -347,11 +347,7 @@ workflows: - release releaseManually: jobs: - - release: - # filters: - # branches: - # only: - # - release + - release mergeBack: jobs: - mergeBack: From 387769658cf8be70c445014198d3c940a9953502 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:53:52 +0200 Subject: [PATCH 09/16] fix simsala path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab4ab15ced..6e739d7789 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: steps: - checkout - yarn-install - - run: simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" + - run: node_modules/.bin/simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From 574907bb818bcce1c422f619bb98d9dc7173c910 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 10:57:16 +0200 Subject: [PATCH 10/16] use default node docker --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e739d7789..23a14db822 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ aliases: - &DIST /tmp/voyager/dist - &DIST_TESTNET /tmp/voyager/dist_testnet # Pick docker versions here only, then use the aliases in the executors definition - - &docker-node tendermintdev/voyager_node + - &docker-node circleci/node:10.15.3 - &docker-browsers tendermintdev/voyager_node_browser - &docker-go circleci/golang:1.11 - &docker-deploy tendermintdev/website_deployment From 5dd67c9c052cd75b5e9d63f35e9d28c894e7f5f3 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 11:03:16 +0200 Subject: [PATCH 11/16] try other env in simsala to fix circle --- .circleci/config.yml | 4 ++-- package.json | 4 ++-- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23a14db822..4cdd8dee0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ aliases: - &DIST /tmp/voyager/dist - &DIST_TESTNET /tmp/voyager/dist_testnet # Pick docker versions here only, then use the aliases in the executors definition - - &docker-node circleci/node:10.15.3 + - &docker-node tendermintdev/voyager_node - &docker-browsers tendermintdev/voyager_node_browser - &docker-go circleci/golang:1.11 - &docker-deploy tendermintdev/website_deployment @@ -136,7 +136,7 @@ jobs: executor: node steps: - checkout - - run: tasks/pending-changed-check.sh + - run: node_modules/.bin/simsala check --pending-path ./changes lint: executor: node diff --git a/package.json b/package.json index 1ed4964f73..3421463722 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "postcss-preset-env": "6.6.0", "prettier": "1.17.0", "publish-release": "1.6.0", - "simsala": "0.0.7", + "simsala": "0.0.11", "style-loader": "0.23.1", "stylelint": "9.10.1", "stylelint-config-standard": "18.2.0", @@ -156,4 +156,4 @@ ] } } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 25b52029b2..0836dadaf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9990,10 +9990,10 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -simsala@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/simsala/-/simsala-0.0.6.tgz#eed53c62399d252be6d50e3e31089cf0ec4ee300" - integrity sha512-zJC0BB9O6r4g01X3o76KeVAToF64MnycmFJxmQKQn7zWSKmYM6wrsc7zosuLfwF+yw1Hsf4ikDA85tIB2COEMA== +simsala@0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/simsala/-/simsala-0.0.11.tgz#534042781a1d775266edad7b7eb5c8d33b10862f" + integrity sha512-++WphCkzFWxKlJwHikWgEwd/gDBiZGs1vU1KCvTAaZtoOC3wHYzebXsYC3Z6s+fD5dtlckDaw6u00bd6UTv4Dw== dependencies: axios "^0.18.0" commander "^2.20.0" From 9eb8e707d6d9221a7398d6c3934541f0746e63b2 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 11:09:17 +0200 Subject: [PATCH 12/16] try start simsala cli directly --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cdd8dee0c..b3d7576959 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,8 @@ jobs: executor: node steps: - checkout - - run: node_modules/.bin/simsala check --pending-path ./changes + - run: yarn i simsala + - run: node node_modules/simsala/src/cli.js check --pending-path ./changes lint: executor: node @@ -229,8 +230,8 @@ jobs: executor: node steps: - checkout - - yarn-install - - run: node_modules/.bin/simsala release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" + - run: yarn i simsala + - run: node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From 9f6f9a29daf33cbf87dce65d0345c8988914645b Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 11:14:40 +0200 Subject: [PATCH 13/16] fix yarn i --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3d7576959..558845deb7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: executor: node steps: - checkout - - run: yarn i simsala + - run: yarn add simsala - run: node node_modules/simsala/src/cli.js check --pending-path ./changes lint: @@ -230,7 +230,7 @@ jobs: executor: node steps: - checkout - - run: yarn i simsala + - run: yarn add simsala - run: node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync From 4add7c2ba5f6a06e5cb381ff9ea72ddce689b188 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 11:24:34 +0200 Subject: [PATCH 14/16] fix release by adding got user config --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 558845deb7..29a438a395 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,8 +230,11 @@ jobs: executor: node steps: - checkout - - run: yarn add simsala - - run: node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" + - run: | + yarn add simsala + git config user.email "bot@lunie.io" + git config user.name "Lunie Bot" + node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From cc78b1bac4fa9dce7b60e268ce0b66668d2d94d1 Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 17 May 2019 11:32:16 +0200 Subject: [PATCH 15/16] fix artifact url --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29a438a395..2203aba411 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -234,7 +234,8 @@ jobs: yarn add simsala git config user.email "bot@lunie.io" git config user.name "Lunie Bot" - node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" + REPO_ID=99653950 + node node_modules/simsala/src/cli.js release-candidate --pending-path ./changes --owner luniehq --repository lunie --token ${GIT_BOT_TOKEN} --message "#Release Candidate\n\nPlease manually test before merging this to master here" # Push merges to master immediatly back to develop to stay in sync mergeBack: From 5d616a415fcfbc7070af2ff7fd5eeb8641260273 Mon Sep 17 00:00:00 2001 From: Lunie Bot Date: Fri, 17 May 2019 09:33:37 +0000 Subject: [PATCH 16/16] release-1.0.0 --- CHANGELOG.md | 23 +++++++++++++++++++ ...2378-disable-withdrawl-on-zero-delegations | 1 - changes/colw_2579-organise-github-files | 1 - changes/colw_2580-remove-docs-folder | 1 - changes/colw_2582-remove-unused-themes | 1 - changes/colw_remove-onboarding-code-assets | 1 - ...el_1735-implement-multi-step-action-modals | 1 - changes/miguel_2538-cant-sign-out-of-mobile | 1 - ...Transaction-From-detail-is-missing-a-space | 1 - changes/testnet-set-num-nodes | 1 - package.json | 2 +- 11 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 changes/colw_2378-disable-withdrawl-on-zero-delegations delete mode 100644 changes/colw_2579-organise-github-files delete mode 100644 changes/colw_2580-remove-docs-folder delete mode 100644 changes/colw_2582-remove-unused-themes delete mode 100644 changes/colw_remove-onboarding-code-assets delete mode 100644 changes/miguel_1735-implement-multi-step-action-modals delete mode 100644 changes/miguel_2538-cant-sign-out-of-mobile delete mode 100644 changes/miguel_2591-LiBankTransaction-From-detail-is-missing-a-space delete mode 100644 changes/testnet-set-num-nodes diff --git a/CHANGELOG.md b/CHANGELOG.md index 0237e0ba02..ead40c0782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. +## [1.0.0] - 2019-05-17 + +### Added + +- [#1735](https://github.com/cosmos/lunie/issues/1735) implement multi step action modals @migueog +- [#2589](https://github.com/cosmos/lunie/pull/2589) Set number of nodes run on local testnet via environment variable @colw + +### Changed + +- [#2579](https://github.com/cosmos/lunie/issues/2579) Move remaining Github specific files to .github folder @colw + +### Fixed + +- [#2378](https://github.com/cosmos/lunie/issues/2378) Do not show withdrawal button when user has no rewards avilable @colw +- [#2538](https://github.com/cosmos/lunie/issues/2538) Added sign out menu item to AppMenu.vue @migueog +- [#2592](https://github.com/cosmos/lunie/issues/2592) Add a   to LiBankTransaction so that there is a space between From and the address @migueog + +### Deprecated + +- [#2580](https://github.com/cosmos/lunie/issues/2580) Remove docs folder @colw +- [#2582](https://github.com/cosmos/lunie/issues/2582) Remove unused theme JSON files @colw +- [#2597](https://github.com/cosmos/lunie/pull/2597) Remvoe onboarding code and realted assets @colw + ## [1.0.0-beta.68] - 2019-05-15 ### Fixed diff --git a/changes/colw_2378-disable-withdrawl-on-zero-delegations b/changes/colw_2378-disable-withdrawl-on-zero-delegations deleted file mode 100644 index 86abcc2277..0000000000 --- a/changes/colw_2378-disable-withdrawl-on-zero-delegations +++ /dev/null @@ -1 +0,0 @@ -[Fixed] [#2378](https://github.com/cosmos/lunie/issues/2378) Do not show withdrawal button when user has no rewards avilable @colw \ No newline at end of file diff --git a/changes/colw_2579-organise-github-files b/changes/colw_2579-organise-github-files deleted file mode 100644 index 2cc5583e4d..0000000000 --- a/changes/colw_2579-organise-github-files +++ /dev/null @@ -1 +0,0 @@ -[Changed] [#2579](https://github.com/cosmos/lunie/issues/2579) Move remaining Github specific files to .github folder @colw \ No newline at end of file diff --git a/changes/colw_2580-remove-docs-folder b/changes/colw_2580-remove-docs-folder deleted file mode 100644 index a57c18a799..0000000000 --- a/changes/colw_2580-remove-docs-folder +++ /dev/null @@ -1 +0,0 @@ -[Deprecated] [#2580](https://github.com/cosmos/lunie/issues/2580) Remove docs folder @colw \ No newline at end of file diff --git a/changes/colw_2582-remove-unused-themes b/changes/colw_2582-remove-unused-themes deleted file mode 100644 index 91b677f00d..0000000000 --- a/changes/colw_2582-remove-unused-themes +++ /dev/null @@ -1 +0,0 @@ -[Deprecated] [#2582](https://github.com/cosmos/lunie/issues/2582) Remove unused theme JSON files @colw \ No newline at end of file diff --git a/changes/colw_remove-onboarding-code-assets b/changes/colw_remove-onboarding-code-assets deleted file mode 100644 index c3d3a6b11a..0000000000 --- a/changes/colw_remove-onboarding-code-assets +++ /dev/null @@ -1 +0,0 @@ -[Deprecated] [#2597](https://github.com/cosmos/lunie/pull/2597) Remvoe onboarding code and realted assets @colw \ No newline at end of file diff --git a/changes/miguel_1735-implement-multi-step-action-modals b/changes/miguel_1735-implement-multi-step-action-modals deleted file mode 100644 index 8072bdfdbd..0000000000 --- a/changes/miguel_1735-implement-multi-step-action-modals +++ /dev/null @@ -1 +0,0 @@ -[Added] [#1735](https://github.com/cosmos/lunie/issues/1735) implement multi step action modals @migueog \ No newline at end of file diff --git a/changes/miguel_2538-cant-sign-out-of-mobile b/changes/miguel_2538-cant-sign-out-of-mobile deleted file mode 100644 index d2875d7ac5..0000000000 --- a/changes/miguel_2538-cant-sign-out-of-mobile +++ /dev/null @@ -1 +0,0 @@ -[Fixed] [#2538](https://github.com/cosmos/lunie/issues/2538) Added sign out menu item to AppMenu.vue @migueog \ No newline at end of file diff --git a/changes/miguel_2591-LiBankTransaction-From-detail-is-missing-a-space b/changes/miguel_2591-LiBankTransaction-From-detail-is-missing-a-space deleted file mode 100644 index f37b827785..0000000000 --- a/changes/miguel_2591-LiBankTransaction-From-detail-is-missing-a-space +++ /dev/null @@ -1 +0,0 @@ -[Fixed] [#2592](https://github.com/cosmos/lunie/issues/2592) Add a   to LiBankTransaction so that there is a space between From and the address @migueog \ No newline at end of file diff --git a/changes/testnet-set-num-nodes b/changes/testnet-set-num-nodes deleted file mode 100644 index f2f07d0df3..0000000000 --- a/changes/testnet-set-num-nodes +++ /dev/null @@ -1 +0,0 @@ -[Added] [#2589](https://github.com/cosmos/lunie/pull/2589) Set number of nodes run on local testnet via environment variable @colw \ No newline at end of file diff --git a/package.json b/package.json index 3421463722..95b35a0e45 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "lunie", "productName": "lunie", - "version": "1.0.0-beta.68", + "version": "1.0.0", "description": "Lunie is the user interface for the Cosmos Hub.", "author": "Lunie International Software Systems Inc. ", "license": "Apache-2.0",