Skip to content

Commit

Permalink
Formatting fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
uazizTT committed Oct 31, 2024
1 parent 62bf8c6 commit 1fbfb89
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 8 deletions.
17 changes: 17 additions & 0 deletions .github/on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: On PR

on:
workflow_dispatch:
pull_request:
branches: [ "main" ]

jobs:
pre-commit:
uses: ./.github/workflows/pre-commit.yml
secrets: inherit
spdx:
uses: ./.github/workflows/spdx.yml
secrets: inherit
build-and-test:
uses: ./.github/workflows/build-and-test.yml
secrets: inherit
14 changes: 7 additions & 7 deletions .github/workflows/nightly-uplift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
- cron: '0 8 * * *' # Runs at 08:00 UTC every day
workflow_dispatch: # Manual trigger

jobs:
uplift-pr:
jobs:
uplift-pr:
runs-on: ubuntu-latest

env:
Expand Down Expand Up @@ -47,20 +47,20 @@ jobs:
base: main
commit-message: "Uplift ${{ env.SUBMODULE_PATH }} to ${{ env.SUBMODULE_VERSION }} ${{ env.TODAY }}"
title: "Uplift ${{ env.SUBMODULE_PATH }} to ${{ env.SUBMODULE_VERSION }} ${{ env.TODAY }}"
body: "This PR uplifts the ${{ env.SUBMODULE_PATH }} to the ${{ env.SUBMODULE_VERSION }}"
body: "This PR uplifts the ${{ env.SUBMODULE_PATH }} to the ${{ env.SUBMODULE_VERSION }}"
labels: uplift
delete-branch: true
token: ${{ secrets.GH_TOKEN }}

- name: Approve Pull Request
if: ${{ steps.create-pr.outputs.pull-request-number }}
env:
GITHUB_TOKEN: ${{ secrets.GH_APPROVE_TOKEN }}
run: |
echo "Pull Request Number - ${{ steps.create-pr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}"
gh pr review ${{ steps.create-pr.outputs.pull-request-number }} --approve
echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}"
gh pr review ${{ steps.create-pr.outputs.pull-request-number }} --approve
- name: Enable Pull Request Automerge
if: ${{ steps.create-pr.outputs.pull-request-number }}
run: gh pr merge --squash --auto "${{ steps.create-pr.outputs.pull-request-number }}"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ on:
branches: [ "main" ]

jobs:
pre-commit:
uses: ./.github/workflows/pre-commit.yml
secrets: inherit
spdx:
uses: ./.github/workflows/spdx.yml
secrets: inherit
build-and-test:
uses: ./.github/workflows/build-and-test.yml
secrets: inherit
secrets: inherit

0 comments on commit 1fbfb89

Please sign in to comment.