Commit aba7820e authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬
Browse files

Merge branch 'bvl/fix-release' into 'master' 

fix(release): set the correct release branch

See merge request !149

Merged-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Approved-by: Hercules Merscher's avatarHercules Merscher <hmerscher@gitlab.com>
Approved-by: Matthias Käppler's avatarMatthias Käppler <mkaeppler@gitlab.com>
parents ede29678 85e5ffee

.gitlab-ci.yml

+3 −10
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ include: 


  # Runs rspec tests and rubocop on the project

  # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/ruby.md

  - project: 'gitlab-com/gl-infra/common-ci-tasks'

  - project: "gitlab-com/gl-infra/common-ci-tasks"

    ref: v2.77 # renovate:managed

    file: templates/ruby.yml



  - project: 'gitlab-com/gl-infra/common-ci-tasks'

  - project: "gitlab-com/gl-infra/common-ci-tasks"

    ref: v2.77 # renovate:managed

    file: 'danger.yml'

    file: "danger.yml"



.test_template: &test_definition

  extends: .with_bundle
@@ -55,10 +55,3 @@ deploy: 
    - tools/deploy-rubygem.sh

  only:

    - tags
 


release:

  stage: release

  script:

    - tools/update-changelog.rb "${CI_COMMIT_TAG}"

  only:

    - tags

.releaserc.json

+1 −3
Original line number Diff line number Diff line 
{

  "branches": [

    "main"

  ],

  "branches": ["master"],

  "plugins": [

    [

      "@semantic-release/commit-analyzer",