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 diff --git a/Jenkinsfile b/Jenkinsfile index cec75c8c..1b1d745e 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') { @@ -16,7 +14,7 @@ pipeline { stage('Build') { steps { // Run Gradle build - sh 'gradle clean build' + sh 'gradle StreamlineCore-BAPI:build' } } stage('Publish Artifacts') {