Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/mui/lab-5.0.0-alpha.140
Browse files Browse the repository at this point in the history
  • Loading branch information
GrantBirki authored Aug 18, 2023
2 parents 4e67f32 + d7b2da8 commit 5722345
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:

- uses: github/branch-deploy@v7.2.0
- uses: github/branch-deploy@v7.3.0
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand All @@ -35,7 +35,7 @@ jobs:
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

- uses: actions/setup-node@v3.7.0
- uses: actions/setup-node@v3.8.0
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:

# check to ensure all JSON files are valid in the repository
- name: json-yaml-validate
uses: GrantBirki/json-yaml-validate@v2.0.0
uses: GrantBirki/json-yaml-validate@v2.3.0
with:
comment: "true"

- uses: actions/setup-node@v3.7.0
- uses: actions/setup-node@v3.8.0
with:
node-version-file: .node-version
cache: 'npm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: deployment check
uses: github/branch-deploy@v7.2.0
uses: github/branch-deploy@v7.3.0
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand All @@ -29,9 +29,9 @@ jobs:
# check to ensure all JSON files are valid in the repository
- name: json-yaml-validate
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: GrantBirki/json-yaml-validate@v2.0.0
uses: GrantBirki/json-yaml-validate@v2.3.0

- uses: actions/setup-node@v3.7.0
- uses: actions/setup-node@v3.8.0
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/branch-deploy@v7.2.0
uses: github/branch-deploy@v7.3.0
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
2 changes: 1 addition & 1 deletion src/components/menu/alert-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const alertConfig = {
// set this bool if the site alert should be enabled or not
alertEnabled: true,
alertEnabled: false,

// valid alert colors
alertColors: {
Expand Down

0 comments on commit 5722345

Please sign in to comment.