Skip to content

Commit

Permalink
Revert the correct code.. (#89)
Browse files Browse the repository at this point in the history
* Revert the correct code..

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Updates workflows to trigger on 1.* branches

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
  • Loading branch information
dbbaughe committed Sep 10, 2021
1 parent 7ed071b commit 10ba1af
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 5 deletions.
43 changes: 42 additions & 1 deletion .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ on:
pull_request:
branches:
- main
- 1.*
push:
branches:
- main
- development-*
- 1.*
env:
OPENSEARCH_DASHBOARDS_VERSION: '1.x'
OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
Expand All @@ -25,6 +26,46 @@ jobs:
with:
# TODO: Parse this from index management plugin
java-version: 14
# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal
# dependencies: common-utils
- name: Checkout common-utils
uses: actions/checkout@v2
with:
repository: 'opensearch-project/common-utils'
path: common-utils
ref: 'main'
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
# dependencies: job-scheduler
- name: Checkout job-scheduler
uses: actions/checkout@v2
with:
repository: 'opensearch-project/job-scheduler'
path: job-scheduler
ref: 'main'
- name: Build job-scheduler
working-directory: ./job-scheduler
run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
# dependencies: alerting-notification
- name: Checkout alerting
uses: actions/checkout@v2
with:
repository: 'opensearch-project/alerting'
path: alerting
ref: 'main'
- name: Build alerting
working-directory: ./alerting
run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
- name: Checkout index management
uses: actions/checkout@v2
with:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/links.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Link Checker
on:
push:
branches: [ main ]
branches:
- main
- 1.*
pull_request:
branches: [ main ]
branches:
- main
- 1.*

jobs:
linkchecker:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ on:
pull_request:
branches:
- main
- 1.*
push:
branches:
- main
- development-*
- 1.*

jobs:
tests:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ If you discover a potential security issue in this project we ask that you notif

## License

This project is licensed under the [Apache v2.0 License](LICENSE.txt).
This project is licensed under the [Apache v2.0 License](LICENSE).

## Copyright

Expand Down

0 comments on commit 10ba1af

Please sign in to comment.