Rename dev-ose branch to main-ose

This commit is contained in:
Ricki Hirner 2024-04-09 18:16:10 +02:00
parent 74e89bde9b
commit 1cd0df1e6a
2 changed files with 6 additions and 6 deletions

View file

@ -2,10 +2,10 @@ name: "CodeQL"
on: on:
push: push:
branches: [ "dev-ose", main-ose ] branches: [ main-ose ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ "dev-ose" ] branches: [ main-ose ]
schedule: schedule:
- cron: '22 10 * * 1' - cron: '22 10 * * 1'
concurrency: concurrency:
@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: temurin
java-version: 17 java-version: 17
- uses: gradle/actions/setup-gradle@v3 - uses: gradle/actions/setup-gradle@v3
with: with:

View file

@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
env: env:
is_main_branch: ${{ github.ref == 'refs/heads/dev-ose' }} is_main_branch: ${{ github.ref == 'refs/heads/main-ose' }}
jobs: jobs:
test: test:
@ -39,7 +39,7 @@ jobs:
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
key: app_build-tests-without-emulator 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: | path: |
.gradle/configuration-cache .gradle/configuration-cache
app/build app/build
@ -74,7 +74,7 @@ jobs:
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
key: app_build-tests-with-emulator 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: | path: |
.gradle/configuration-cache .gradle/configuration-cache
app/build app/build