From ed76e9a9b9666afbcfc6f80500500b4739585a25 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 29 Jul 2025 05:26:58 -0400 Subject: [PATCH 1/5] test: gradle --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index cec75c8c..087fccd0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,10 @@ pipeline { stage('Build') { steps { // Run Gradle build + sh 'echo $JAVA_HOME' + sh 'echo $GRADLE_HOME' + sh 'java -version' + sh 'gradle --version' sh 'gradle clean build' } } From 6186cc054ea6c690ce08ec0397c5eebc75642099 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 29 Jul 2025 05:31:17 -0400 Subject: [PATCH 2/5] test: gradle 2 --- Jenkinsfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 087fccd0..c5ecf525 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,13 +14,8 @@ pipeline { } } stage('Build') { - steps { - // Run Gradle build - sh 'echo $JAVA_HOME' - sh 'echo $GRADLE_HOME' - sh 'java -version' - sh 'gradle --version' - sh 'gradle clean build' + withGradle { + sh './gradlew build' } } stage('Publish Artifacts') { From 5fba87c5e0bd174e1871dd0d0fd2ea833e7b7827 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 29 Jul 2025 05:39:06 -0400 Subject: [PATCH 3/5] test: Jenkinsfile --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5ecf525..535b0e30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,8 +3,6 @@ pipeline { tools { // Specify the Gradle version configured in Jenkins gradle 'Gradle' - // Specify the JDK version configured in Jenkins - jdk 'Java 21' } stages { stage('Checkout') { @@ -14,8 +12,9 @@ pipeline { } } stage('Build') { - withGradle { - sh './gradlew build' + steps { + // Run Gradle build + sh 'gradle clean build' } } stage('Publish Artifacts') { From b964b715ce68c581b9cf6ec7b07200b7b9df0111 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 29 Jul 2025 05:46:01 -0400 Subject: [PATCH 4/5] test: Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 535b0e30..1b1d745e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stage('Build') { steps { // Run Gradle build - sh 'gradle clean build' + sh 'gradle StreamlineCore-BAPI:build' } } stage('Publish Artifacts') { From 3061eea184a72ba841f728ec077e31ae78f05dbe Mon Sep 17 00:00:00 2001 From: Drak Date: Tue, 29 Jul 2025 05:50:40 -0400 Subject: [PATCH 5/5] remove: problem actions --- .github/workflows/create-pr.yml | 23 ------------------ .github/workflows/merge-pr.yml | 41 --------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 .github/workflows/create-pr.yml delete mode 100644 .github/workflows/merge-pr.yml diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml deleted file mode 100644 index a6f97173..00000000 --- a/.github/workflows/create-pr.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Auto Create Pull Request - -on: - push: - branches: - - dev - -jobs: - create-pull-request: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Create Pull Request - uses: repo-sync/pull-request@v2 - with: - source_branch: dev - destination_branch: master - pr_title: "Auto PR: Merge dev into master" - pr_body: "This PR merges changes from dev into master." - github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml deleted file mode 100644 index 4ac99287..00000000 --- a/.github/workflows/merge-pr.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Auto Merge Dev to Master - -on: -# schedule: -# - cron: "0 * * * *" # Runs every hour - workflow_dispatch: # Allows manual trigger - pull_request: - branches: - - master - types: - - opened - - synchronize - -jobs: - auto-merge: - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Install GitHub CLI - run: | - sudo apt-get update - sudo apt-get install -y gh - - - name: Find and Merge Pull Requests - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - # Configure `gh` CLI to use GITHUB_TOKEN directly - gh auth status || echo "Using GITHUB_TOKEN for authentication." - - # Fetch PRs from `dev` to `master` - PRS=$(gh pr list --base master --head dev --state open --json number,mergeable -q '.[] | select(.mergeable == true) | .number') - echo "Found PRs: $PRS" - - for PR in $PRS; do - echo "Merging PR #$PR" - gh pr merge $PR --merge --admin - done