Skip to content

Commit

Permalink
chore(ci): update workflows to use new branch names (#895)
Browse files Browse the repository at this point in the history
`main` will be the current version of the editor/viewer applications and
`next` will contain the upcoming refactorings for the next version of
the application.
  • Loading branch information
Kyle Laker authored Jun 12, 2023
1 parent 85f2e4c commit 8e6cc2a
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 47 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,16 @@ updates:
commit-message:
include: scope
prefix: "chore"
target-branch: main
reviewers:
- "EasyDynamics/oscal-editor-reviewers"
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
commit-message:
include: scope
prefix: "chore"
target-branch: next
reviewers:
- "EasyDynamics/oscal-editor-reviewers"
5 changes: 3 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ name: "CodeQL"
on:
push:
branches:
- develop
- main
- next
pull_request:
branches:
- develop
- main
- next
schedule:
- cron: '19 6 * * 4'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev-viewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy viewer to Dev environment

on:
push:
branches: ["develop"]
branches: ["main"]
workflow_dispatch:
schedule:
# Run daily at 03:15 UTC (10:15/11:15 ET)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod-viewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy viewer to Production environment

on:
push:
branches: ["develop"]
tags: ["v*"]
workflow_dispatch:
schedule:
# Run daily at 03:15 UTC (10:15/11:15 ET)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish Storybook
on:
push:
branches:
- develop
- main
workflow_dispatch:

permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches:
- main
- develop
- next

permissions:
contents: read
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/publish-package.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: main

- name: Setup node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -82,7 +84,7 @@ jobs:
by running `npm-check-updates` and `npm install`.
branch: automation/update-npm-dependencies
delete-branch: true
base: develop
base: main
committer: Easy Dynamics Automation <[email protected]>
author: Easy Dynamics Automation <[email protected]>
token: "${{ steps.generate-token.outputs.token }}"
3 changes: 2 additions & 1 deletion .github/workflows/update-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: main
- name: Setup Node.js
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -118,7 +119,7 @@ jobs:
add-paths: |
packages/oscal-types
delete-branch: true
base: develop
base: main
committer: Easy Dynamics Automation <[email protected]>
author: Easy Dynamics Automation <[email protected]>
token: "${{ steps.generate-token.outputs.token }}"

0 comments on commit 8e6cc2a

Please sign in to comment.