Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into prepare-for-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Matic Lubej committed Nov 7, 2023
2 parents e192e07 + 5d699d0 commit cdf1014
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci_trigger.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build
name: mirror_and_trigger

on:
pull_request:
Expand All @@ -9,8 +9,7 @@ on:
workflow_call:
release:
types:
- created # draft release
# - published
- published

jobs:
mirror-and-integration-test-on-gitlab:
Expand All @@ -23,9 +22,9 @@ jobs:
with:
args: "https://git.sinergise.com/eo/code/eo-learn/"
env:
FOLLOW_TAGS: "true"
GITLAB_HOSTNAME: "git.sinergise.com"
GITLAB_USERNAME: "github-action"
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
GITLAB_PROJECT_ID: "164"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REF: $GITHUB_REF
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ build_docker_image:
stage: build
needs: []
rules:
- if: $GITHUB_REF =~ /^refs\/tags\/ # run only on releases
- if: $CI_COMMIT_TAG # run only on releases
when: always
variables:
- CUSTOM_RUN_TAG: auto # this will create images with the latest tag and the version tag
- LAYER_NAME: dotai-eo
CUSTOM_RUN_TAG: auto # this will create images with the latest tag and the version tag
LAYER_NAME: dotai-eo
- when: manual
trigger:
project: teams/eor/dotai/infra
Expand Down

0 comments on commit cdf1014

Please sign in to comment.