Skip to content

ci: Update the main branch #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdecker merged 1 commit into from
Mar 17, 2026
Merged

ci: Update the main branch #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gitlab/deploy-maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build_kotlin:
- m4
rules:
- if: "$CI_COMMIT_TAG"
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_COMMIT_BRANCH == "main"'
script:
- task build:kotlin
artifacts:
Expand Down Expand Up @@ -50,7 +50,7 @@ publish_snapshot_to_maven:
- job: build_kotlin
artifacts: true
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_COMMIT_BRANCH == "main"'
when: manual
script:
- cd libs/gl-sdk-android
Expand Down
2 changes: 1 addition & 1 deletion gitlab/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ build_ci_image:
changes:
paths:
- docker/ci.Dockerfile
compare_to: master
compare_to: main
script:
- docker pull ${CI_IMAGE}:latest || true
- export IMAGE_TAG=${CI_COMMIT_SHORT_SHA}-$(date +%Y%m%d)
Expand Down
Loading