From 1cd0df1e6aeeef9a1f1c11a8cd9b7ada833d3963 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 9 Apr 2024 18:16:10 +0200 Subject: [PATCH] Rename dev-ose branch to main-ose --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/test-dev.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bdb8b535..f9593017 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,10 +2,10 @@ name: "CodeQL" on: push: - branches: [ "dev-ose", main-ose ] + branches: [ main-ose ] pull_request: # The branches below must be a subset of the branches above - branches: [ "dev-ose" ] + branches: [ main-ose ] schedule: - cron: '22 10 * * 1' concurrency: @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: temurin java-version: 17 - uses: gradle/actions/setup-gradle@v3 with: diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml index 4b955f42..fdb31c46 100644 --- a/.github/workflows/test-dev.yml +++ b/.github/workflows/test-dev.yml @@ -9,7 +9,7 @@ concurrency: cancel-in-progress: true env: - is_main_branch: ${{ github.ref == 'refs/heads/dev-ose' }} + is_main_branch: ${{ github.ref == 'refs/heads/main-ose' }} jobs: test: @@ -39,7 +39,7 @@ jobs: uses: actions/cache/restore@v4 with: key: app_build-tests-without-emulator - restore-keys: app_build-tests-without-emulator- # restore cache from dev branch + restore-keys: app_build-tests-without-emulator- # restore cache from main branch path: | .gradle/configuration-cache app/build @@ -74,7 +74,7 @@ jobs: uses: actions/cache/restore@v4 with: key: app_build-tests-with-emulator - restore-keys: app_build-tests-with-emulator- # restore cache from dev branch + restore-keys: app_build-tests-with-emulator- # restore cache from main branch path: | .gradle/configuration-cache app/build