Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/release branch gitflow #4034

Merged
merged 24 commits into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7d9c122
release branch gitflow
luqmanbello Jan 17, 2023
3b44b62
installer test
luqmanbello Jan 17, 2023
f90717b
Revert intel build fix
luqmanbello Jan 17, 2023
6415989
Merge branch 'develop' into feature/release-branch-gitflow
luqmanbello Jan 17, 2023
05f6b51
poetry install
luqmanbello Jan 18, 2023
502efc4
Mac build poetry fix
luqmanbello Jan 18, 2023
586002f
Poetry cache clear
luqmanbello Jan 18, 2023
a4c61ec
Poetry fix
luqmanbello Jan 18, 2023
83ec896
Added cancel
luqmanbello Jan 19, 2023
af23d6e
Merge branch 'develop' into feature/release-branch-gitflow
luqmanbello Jan 19, 2023
ad397aa
Minor fix
luqmanbello Jan 19, 2023
ba66d23
Merge branch 'develop' into feature/release-branch-gitflow
luqmanbello Jan 19, 2023
c3f154f
Github Pages fix
luqmanbello Jan 20, 2023
70b8a0c
GH page fix
luqmanbello Jan 20, 2023
aa9ef58
Added condition to docker publish
luqmanbello Jan 23, 2023
1eb4895
Merge branch 'develop' into feature/release-branch-gitflow
luqmanbello Jan 23, 2023
28b56b5
Fix nightly build
luqmanbello Jan 23, 2023
d2475ea
Merge branch 'feature/release-branch-gitflow' of https://github.com/O…
luqmanbello Jan 23, 2023
5bf9991
Added hotfix to integration test and build gh run
luqmanbello Jan 23, 2023
f74f3df
Minor fix
luqmanbello Jan 24, 2023
d251568
Edit trigger for integration test
luqmanbello Jan 24, 2023
d472e62
Merge branch 'develop' into feature/release-branch-gitflow
jmaslek Jan 24, 2023
8b3643d
minor corrections
luqmanbello Jan 25, 2023
ee334c7
Merge branch 'feature/release-branch-gitflow' of https://github.com/O…
luqmanbello Jan 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Trigger Build on Release and PRs to Main

env:
OPENBB_ENABLE_QUICK_EXIT: true
OPENBB_LOG_COLLECT: false
OPENBB_USE_ION: false
OPENBB_USE_PROMPT_TOOLKIT: false
PIP_DEFAULT_TIMEOUT: 100
PYTHONNOUSERSITE: 1

on:
push:
branches:
- release/*
- hotfix/*
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
actions: write

jobs:
trigger-windows-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: windows10_build.yml

trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: m1_macos_build.yml

trigger-intel-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: intel_macos_build.yml

trigger-docker-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: docker.yml
1 change: 1 addition & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ jobs:
- name: Publishing the Docker image
run: |
docker push "${OPENBBTERMINAL_DOCKER_POETRY_IMAGE}"
if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/release/')
5 changes: 1 addition & 4 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
name: Deploy to GitHub Pages

on:
pull_request:
push:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isnt this what caused the issue the other day?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually when it's onpull_request that it was giving issues

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmaslek please help approve. there is also a fix for nightly build here

branches:
- main
types: [closed]


jobs:
generate:
name: Generate and Deploy documentation
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Git checkout
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
push:
branches:
- release/*
pull_request:
branches:
- develop
- main

concurrency:
Expand All @@ -16,11 +13,15 @@ concurrency:
jobs:
integration-tests:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.merged == true
steps:
- name: Checkout code
if: github.event_name == 'push'
uses: actions/checkout@v3

- name: Checkout specific ref
if: github.event_name == 'pull_request'
run: git fetch origin ${{ github.event.pull_request.head.ref }} && git checkout FETCH_HEAD

- name: Setup Python 3.9
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -48,4 +49,4 @@ jobs:
- name: Run integration tests
run: |
source $VENV
python terminal.py /home/runner/work/OpenBBTerminal_fork/OpenBBTerminal_fork/openbb_terminal/miscellaneous/integration_tests_scripts -t
python terminal.py /home/runner/work/OpenBBTerminal/OpenBBTerminal/openbb_terminal/miscellaneous/integration_tests_scripts -t
22 changes: 14 additions & 8 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ on:
schedule:
- cron: "0 0 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
permissions:
actions: write

jobs:
trigger-windows-build:
Expand All @@ -24,21 +23,28 @@ jobs:
- name: Trigger Windows Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: windows.yml

workflow: windows10_build.yml
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
- name: Trigger M1 MacOs Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: m1_macos_build.yml

trigger-intel-build:
runs-on: ubuntu-latest
steps:
- name: Trigger Windows Build
- name: Trigger Intel MacOs Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: intel_macos_build.yml


trigger-docker-build:
runs-on: ubuntu-latest
steps:
- name: Trigger docker Build
uses: benc-uk/workflow-dispatch@v1
with:
workflow: docker.yml