Skip to content

Commit

Permalink
Merge pull request #329 from rudderlabs/release/1.4.0
Browse files Browse the repository at this point in the history
chore(release): pull release/1.4.0 into main
  • Loading branch information
ItsSudip authored Jan 24, 2023
2 parents 45ec596 + 50694b2 commit b6b86cb
Show file tree
Hide file tree
Showing 35 changed files with 1,082 additions and 396 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/deploy-to-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Deploy Configurations To Development DB

on:
workflow_dispatch:
pull_request:
types:
- closed
Expand All @@ -12,8 +11,8 @@ jobs:
deploy:
runs-on: ubuntu-latest

# Either triggered from develop branch or merged pull requests
if: github.event.pull_request.merged == true || github.ref == 'refs/heads/develop'
# Only merged pull requests must trigger
if: github.event.pull_request.merged == true
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/deploy-to-prod.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Deploy Configurations To Production DB

on:
workflow_dispatch:
pull_request:
types:
- closed
Expand All @@ -12,8 +11,8 @@ jobs:
deploy:
runs-on: ubuntu-latest

# Either trigger from main or merged pull requests
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true) || github.ref == 'refs/heads/main'
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)

steps:
- name: Checkout
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/deploy-to-sources-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Deploy Configurations To Sources Development DB

on:
workflow_dispatch:
pull_request:
types:
- closed
Expand All @@ -12,8 +11,8 @@ jobs:
deploy:
runs-on: ubuntu-latest

# Either triggered from develop branch or merged pull requests
if: github.event.pull_request.merged == true || github.ref == 'refs/heads/develop'
# Only merged pull requests must trigger
if: github.event.pull_request.merged == true
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deploy-to-staging.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
name: Deploy Configurations To Staging DB

on:
workflow_dispatch:
pull_request:
types:
- opened
- reopened
- synchronize
branches:
- main

jobs:
deploy:
runs-on: ubuntu-latest

# Either from release candidate branches or pull requests must trigger
if: (startsWith(github.ref, 'refs/heads/hotfix-release/') || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/main/')) || (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
# Only pull requests from release candidate branches must trigger
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
134 changes: 134 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* @ItsSudip @shrouti1507 @sandeepdsvs @krishna2020
* @ItsSudip @shrouti1507 @sandeepdsvs @krishna2020 @nidhilashkari17
/src/configurations/ @nidhilashkari17 @debanjan97 @ssbeefeater @AchuthaSourabhC @ruchiramoitra @ashishRudder @ItsSudip @shrouti1507 @sandeepdsvs @krishna2020
/test/ @nidhilashkari17 @debanjan97 @ssbeefeater @AchuthaSourabhC @ruchiramoitra @ashishRudder @ItsSudip @shrouti1507 @sandeepdsvs @krishna2020
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.3.7",
"version": "1.4.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
Loading

0 comments on commit b6b86cb

Please sign in to comment.