Skip to content

Commit 47aff09

Browse files
authored
Merge pull request #155 from WasiqBhamla/staging
🎉 PR: New Release
2 parents fb362f8 + 17deb19 commit 47aff09

File tree

79 files changed

+4044
-1562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4044
-1562
lines changed

.github/workflows/check-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Conventional Commit Check
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- develop
77

88
jobs:
99
build:

.github/workflows/codeql.yml

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: 'CodeQL'
12+
name: 'CodeQL Scannings'
1313

1414
on:
1515
push:
1616
branches:
17-
- main
17+
- develop
18+
1819
pull_request:
1920
branches:
20-
- main
21-
schedule:
22-
- cron: '0 14 * * 6'
21+
- develop
2322

2423
jobs:
2524
analyze:
@@ -33,37 +32,31 @@ jobs:
3332
strategy:
3433
fail-fast: false
3534
matrix:
36-
language: ['java', 'typescript']
35+
language:
36+
- java
37+
- typescript
3738

3839
steps:
3940
- name: Checkout repository
4041
uses: actions/checkout@v3
4142

42-
# Initializes the CodeQL tools for scanning.
43+
- name: Set up JDK 11
44+
uses: actions/setup-java@v1
45+
if: matrix.language == 'java'
46+
with:
47+
java-version: 11
48+
4349
- name: Initialize CodeQL
4450
uses: github/codeql-action/init@v2
4551
with:
4652
languages: ${{ matrix.language }}
47-
# If you wish to specify custom queries, you can do so here or in a config file.
48-
# By default, queries listed here will override any specified in a config file.
49-
# Prefix the list here with "+" to use these queries and those in the config file.
50-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5153

52-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
53-
# If this step fails, then you should remove it and run the build manually (see below)
54-
- name: Autobuild
54+
- name: Auto build typescript
55+
if: matrix.language == 'typescript'
5556
uses: github/codeql-action/autobuild@v2
5657

57-
# ℹ️ Command-line programs to run using the OS shell.
58-
# 📚 https://git.io/JvXDl
59-
60-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
61-
# and modify them (or add more) to build your code if your project
62-
# uses a compiled language
63-
64-
#- run: |
65-
# make bootstrap
66-
# make release
58+
- if: matrix.language == 'java'
59+
run: mvn install -f core-java/pom.xml -DskipTests
6760

6861
- name: Perform CodeQL Analysis
6962
uses: github/codeql-action/analyze@v2
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Create pull request from staging to main
2+
3+
on:
4+
push:
5+
branches:
6+
- staging
7+
8+
jobs:
9+
create-staging-to-main-pr:
10+
runs-on: ubuntu-latest
11+
name: Create pull request from staging to main
12+
steps:
13+
- name: Check out Git repository
14+
uses: actions/checkout@v3
15+
16+
- name: Detect changes between staging and main
17+
id: branch-changes
18+
uses: fjenik/[email protected]
19+
with:
20+
repo-token: ${{ secrets.GITHUB_TOKEN }}
21+
target-branch: main
22+
source-branch: staging
23+
24+
- name: Detect changes output
25+
run: echo "Output of detect changes ${{ steps.branch-changes.outputs.is-source-branch-ahead }}"
26+
27+
- name: Check if pr already exists
28+
id: pr-exists
29+
if: ${{ steps.branch-changes.outputs.is-source-branch-ahead == 'true' }}
30+
uses: fjenik/[email protected]
31+
with:
32+
repo-token: ${{ secrets.GITHUB_TOKEN }}
33+
target-branch: main
34+
source-branch: staging
35+
36+
- name: Print output
37+
run: echo "Output of pull request already exists ${{ steps.pr-exists.outputs.is-pr-already-created }}"
38+
39+
- name: Create pull request
40+
if: ${{ steps.pr-exists.outputs.is-pr-already-created == 'false' }}
41+
uses: repo-sync/pull-request@v2
42+
with:
43+
github_token: ${{ secrets.PUSH_TOKEN }}
44+
source_branch: staging
45+
destination_branch: main
46+
pr_reviewer: boyka-core
47+
pr_title: '🎉 PR: New Release'
48+
pr_draft: true
49+
pr_body: |
50+
_This PR was generated via github actions workflow_
51+
52+
**Don't squash merge this PR**
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Create pull request from develop to staging
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
create-develop-to-staging-pr:
10+
runs-on: ubuntu-latest
11+
name: Create pull request from develop to staging
12+
steps:
13+
- name: Check out Git repository
14+
uses: actions/checkout@v3
15+
16+
- name: Detect changes between develop and staging
17+
id: branch-changes
18+
uses: fjenik/[email protected]
19+
with:
20+
repo-token: ${{ secrets.GITHUB_TOKEN }}
21+
target-branch: staging
22+
source-branch: develop
23+
24+
- name: Detect changes output
25+
run: echo "Output of detect changes ${{ steps.branch-changes.outputs.is-source-branch-ahead }}"
26+
27+
- name: Check if pr already exists
28+
id: pr-exists
29+
if: ${{ steps.branch-changes.outputs.is-source-branch-ahead == 'true' }}
30+
uses: fjenik/[email protected]
31+
with:
32+
repo-token: ${{ secrets.GITHUB_TOKEN }}
33+
target-branch: staging
34+
source-branch: develop
35+
36+
- name: Print output
37+
run: echo "Output of pull request already exists ${{ steps.pr-exists.outputs.is-pr-already-created }}"
38+
39+
- name: Create pull request
40+
if: ${{ steps.pr-exists.outputs.is-pr-already-created == 'false' }}
41+
uses: repo-sync/pull-request@v2
42+
with:
43+
github_token: ${{ secrets.PUSH_TOKEN }}
44+
source_branch: develop
45+
destination_branch: staging
46+
pr_reviewer: boyka-core
47+
pr_title: '🎉 PR: New Release candidate'
48+
pr_draft: true
49+
pr_body: |
50+
_This PR was generated via github actions workflow_
51+
52+
**Don't squash merge this PR**

.github/workflows/deploy-site.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Deploy boyka website on GitHub
33
on:
44
pull_request:
55
branches:
6+
- develop
7+
- staging
68
- main
79
paths:
810
- 'website/**'
@@ -16,7 +18,7 @@ on:
1618

1719
jobs:
1820
checks:
19-
if: github.event_name != 'push'
21+
if: github.event_name == 'pull_request'
2022
runs-on: ubuntu-latest
2123
steps:
2224
- uses: actions/checkout@v3
@@ -30,7 +32,7 @@ jobs:
3032
run: yarn build:site
3133

3234
gh-release:
33-
if: github.event_name != 'pull_request'
35+
if: github.event_name == 'push'
3436
runs-on: ubuntu-latest
3537
steps:
3638
- uses: actions/checkout@v3

.github/workflows/pr-labeler.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
name: Label PRs
1+
name: Label Feature and Bug PRs
22

33
on:
44
pull_request:
5-
types: [opened, closed]
5+
branches:
6+
- develop
7+
types:
8+
- opened
9+
- closed
610

711
jobs:
812
build:

0 commit comments

Comments
 (0)