diff --git a/.github/workflows/release-management.yml b/.github/workflows/release-management.yml index ed92d9f3..d49c44f0 100644 --- a/.github/workflows/release-management.yml +++ b/.github/workflows/release-management.yml @@ -13,8 +13,14 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + release: + name: Release + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/v') + steps: - uses: actions/checkout@v2 with: + fetch-depth: 0 ref: master - uses: actions/setup-node@v1 with: diff --git a/ship.config.js b/ship.config.js index 274b480c..71ea9cbe 100644 --- a/ship.config.js +++ b/ship.config.js @@ -3,12 +3,11 @@ const path = require('path') const dotenv = require('dotenv') const { Octokit } = require('@octokit/rest') -const { loadConfig, getRepoInfo } = require('shipjs-lib') +const { getRepoInfo } = require('shipjs-lib') dotenv.config({ path: path.resolve('.', '.env') }) -const { remote } = loadConfig('.') -const { owner, name: repo } = getRepoInfo(remote, '.') +const { owner, name: repo } = getRepoInfo('origin', '.') const getOctokit = () => { const octokit = new Octokit({ @@ -23,7 +22,6 @@ const isDryRun = (argv) => { } module.exports = { - mergeStrategy: { toSameBranch: ['master'] }, updateChangelog: false, publishCommand: ({ tag }) => `echo Start publish ${tag}`, afterPublish: async () => {