Skip to content

Commit

Permalink
PR changes (#1693)
Browse files Browse the repository at this point in the history
* Update licenses-update.yml

* Update build.yml

* Update test.yml

* Delete .github/workflows/test.yml

* Update build.yml

* Update build.yml

* Update auto-labeler.yml

* Update build.yml

* Update auto-labeler.yml

* Update labeler-config.yml
  • Loading branch information
Frooodle authored Aug 16, 2024
1 parent 00d6559 commit 09c93ce
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 64 deletions.
4 changes: 4 additions & 0 deletions .github/labeler-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@ Test:
- changed-files:
- any-glob-to-any-file: 'cucumber/**/*'
- any-glob-to-any-file: 'src/test**/*'

Github:
- changed-files:
- any-glob-to-any-file: '.github/**/*'
13 changes: 12 additions & 1 deletion .github/workflows/auto-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,22 @@ jobs:
permissions:
contents: read
pull-requests: write
workflows: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/labeler@v5

- name: Apply Labels
uses: actions/labeler@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/labeler-config.yml
sync-labels: true

- name: Trigger Build Workflow
run: |
curl -X POST \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-H "Accept: application/vnd.github+json" \
https://api.github.com/repos/${{ github.repository }}/dispatches \
-d '{"event_type": "trigger-build", "client_payload": {"pr_number": "${{ github.event.pull_request.number }}"}}'
84 changes: 68 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,88 @@
name: "Build repo"
name: Build repo

on:
push:
branches: ["main"]
pull_request:
branches: ["main"]
repository_dispatch:
types: [trigger-build]

jobs:
build:
runs-on: ubuntu-latest

permissions:
actions: read
contents: read
security-events: write
if: |
github.event.client_payload.pr_number &&
contains(github.event.client_payload.labels, 'licenses') == false &&
(
contains(github.event.client_payload.labels, 'Front End') ||
contains(github.event.client_payload.labels, 'Java') ||
contains(github.event.client_payload.labels, 'Back End') ||
contains(github.event.client_payload.labels, 'Security') ||
contains(github.event.client_payload.labels, 'API') ||
contains(github.event.client_payload.labels, 'Docker') ||
contains(github.event.client_payload.labels, 'Test')
)
strategy:
fail-fast: false
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK ${{ matrix.jdk-version }}
uses: actions/setup-java@v4
with:
java-version: "17"
java-version: ${{ matrix.jdk-version }}
distribution: "temurin"

- uses: gradle/actions/setup-gradle@v3
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 8.7

- name: Build with Gradle
run: ./gradlew build --no-build-cache

docker-compose-tests:
if: |
github.event.client_payload.pr_number &&
contains(github.event.client_payload.labels, 'licenses') == false &&
(
contains(github.event.client_payload.labels, 'Front End') ||
contains(github.event.client_payload.labels, 'Java') ||
contains(github.event.client_payload.labels, 'Back End') ||
contains(github.event.client_payload.labels, 'Security') ||
contains(github.event.client_payload.labels, 'API') ||
contains(github.event.client_payload.labels, 'Docker') ||
contains(github.event.client_payload.labels, 'Test')
)
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up Java 17
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "adopt"

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Install Docker Compose
run: |
sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.7"

- name: Pip requirements
run: |
pip install -r ./cucumber/requirements.txt
- name: Run Docker Compose Tests
run: |
chmod +x ./test.sh
./test.sh
9 changes: 9 additions & 0 deletions .github/workflows/licenses-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,14 @@ jobs:
body: |
Auto-generated by [create-pull-request][1]
[1]: https://github.com/peter-evans/create-pull-request
labels: licenses
draft: false
delete-branch: true


- name: Enable auto-merge
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
pull-request-number: ${{ steps.create-pull-request.outputs.pull-request-number }}
merge-method: squash # Choose the merge method: merge, squash, or rebase
47 changes: 0 additions & 47 deletions .github/workflows/test.yml

This file was deleted.

0 comments on commit 09c93ce

Please sign in to comment.