Skip to content

Commit fa38528

Browse files
committed
Merge branch 'synchro-github-ans_reroll' into 'develop'
Synchro github ans reroll See merge request ASIP-Sante/g2/esante-ressources!21
2 parents ca7ba51 + 6cfaa66 commit fa38528

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ stages:
2020
- audits
2121
- packaging
2222
- deploy
23-
- external
2423

2524
################################################################################
2625
# Build job.
@@ -41,4 +40,10 @@ package_generate:
4140
extends: [ .package:generate ]
4241

4342
package_upload:
44-
extends: [ .package:upload ]
43+
extends: [ .package:upload ]
44+
45+
################################################################################
46+
# Deploy
47+
################################################################################
48+
synchro_github:
49+
extends: [ .synchro:github ]

.gitlab/ci/fragments/rules.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
RELEASE_NAME: $CI_COMMIT_REF_SLUG
1313
PACKAGE_NAME: "ressources-${CI_COMMIT_REF_SLUG}.zip"
1414

15-
# releases branches
16-
.releases:
15+
16+
.syncho-github-ans:
1717
rules:
18-
- if: $CI_COMMIT_BRANCH == "releases"
19-
variables:
20-
RELEASE_NAME: $CI_COMMIT_REF_SLUG
21-
PACKAGE_NAME: "ressources-${CI_COMMIT_REF_SLUG}.zip"
18+
- if: $CI_COMMIT_BRANCH == "synchro-github-ans"
2219

2320
# new tag
2421
.tags:
@@ -38,8 +35,6 @@
3835
rules:
3936
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "develop"
4037
when: never
41-
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "releases"
42-
when: never
4338
.merge_request:
4439
rules:
4540
- !reference [.merge_request_restriction, rules]
@@ -51,7 +46,6 @@
5146
.build_rules:
5247
rules:
5348
- !reference [.develop, rules]
54-
- !reference [.releases, rules]
5549
- !reference [.tags, rules]
5650

5751
################################################################################
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Push code to ANS github.
2+
.synchro:github:
3+
stage: deploy
4+
when: manual
5+
rules:
6+
- !reference [.syncho-github-ans, rules]
7+
variables:
8+
GITHUB_URL: github.com/ansforge/DesignSystem.git
9+
script:
10+
- apk add git
11+
- git config --global user.name "${GITLAB_USER_NAME}"
12+
- git config --global user.email "${GITLAB_USER_EMAIL}"
13+
- git checkout -B temp-branch
14+
- git rm -r --cached .
15+
- git add .gitignore
16+
- git add *
17+
- git commit -m "Synchro Klee ANS"
18+
- git remote add github-ans https://root:$GITHUB_TOKEN@$GITHUB_URL
19+
- rm -fr ".git/rebase-merge"
20+
- git pull --no-rebase --no-edit github-ans main-klee
21+
- git push github-ans temp-branch:main-klee
22+
- git clean -f
23+
- git clean -df
24+
- git checkout synchro-github-ans
25+
- git branch -D temp-branch
26+
- git remote rm github-ans

0 commit comments

Comments
 (0)