verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

ci: refs #6695 use TARGET_BRANCH #1466

Merged
alexm merged 27 commits from 6695-fix_CHANGE_TARGET into dev 2025-02-27 08:22:36 +00:00
Conversation 0 Commits 27 Files Changed 2 +11 -11
alexm commented 2025-02-21 12:49:11 +00:00
Member
Copy Link
No description provided.
alexm added 1 commit 2025-02-21 12:49:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e0d0830793 ci: refs #6695 comment out test stages in Jenkinsfile
alexm added 1 commit 2025-02-21 12:54:42 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
64549603ca ci: refs #6695 update docker-compose to use dynamic image tags
alexm added 1 commit 2025-02-21 13:26:33 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
39b7cfbe4e ci: refs #6695 update docker-compose to use dynamic image tags
alexm added 1 commit 2025-02-21 13:49:39 +00:00
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1018a0aa90 ci: refs #6695 remove unnecessary echo statements from Jenkinsfile
alexm changed target branch from dev to test 2025-02-21 13:51:20 +00:00
alexm changed target branch from test to dev 2025-02-21 13:51:47 +00:00
alexm added 1 commit 2025-02-21 13:52:16 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
05994ba1dc ci: refs #6695 remove unnecessary echo statements from Jenkinsfile
alexm added 1 commit 2025-02-21 13:52:35 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
fe6f575f7c Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm changed title from ci: refs #6695 comment out test stages in Jenkinsfile to ci: refs #6695 use TARGET_BRANCH 2025-02-21 13:52:52 +00:00
alexm reviewed 2025-02-21 13:54:02 +00:00
Jenkinsfile Outdated
@ -24,3 +24,3 @@
IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
alexm commented 2025-02-21 13:54:02 +00:00
Author
Member
Copy Link

Ns si estava de antes

Ns si estava de antes
alexm marked this conversation as resolved
alexm added 1 commit 2025-02-21 14:07:05 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
6f688c337e ci: refs #6695 update Jenkinsfile to include 'main' and 'beta' in protected branches
alexm added 1 commit 2025-02-21 14:12:20 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
b2ae8c5714 ci: refs #6695 update Jenkinsfile to improve TARGET_BRANCH assignment logic
alexm added 1 commit 2025-02-21 14:14:21 +00:00
gitea/salix-front/pipeline/pr-dev Build queued... Details
gitea/salix-front/pipeline/pr-test Something is wrong with the build of this commit Details
ddbae9a13d ci: refs #6695 update Jenkinsfile to improve TARGET_BRANCH assignment logic
alexm changed target branch from dev to test 2025-02-21 14:15:03 +00:00
alexm changed target branch from test to dev 2025-02-21 14:15:36 +00:00
alexm added 1 commit 2025-02-21 14:15:57 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
9d5e04a8ae ci: refs #6695 update Jenkinsfile to remove echo statement for TARGET_BRANCH
juan approved these changes 2025-02-21 14:17:49 +00:00
Dismissed
Jenkinsfile Outdated
@ -25,4 +26,1 @@
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}"
juan commented 2025-02-21 14:04:09 +00:00
Owner
Copy Link

Mantinles, es per a depurar

Mantinles, es per a depurar
Jenkinsfile
@ -21,3 +20,3 @@
'beta'
].contains(env.BRANCH_NAME)
]
juan commented 2025-02-21 14:07:22 +00:00
Owner
Copy Link

contains mes simple, comilles simples en 'dev'

contains mes simple, comilles simples en 'dev'
alexm marked this conversation as resolved
Jenkinsfile Outdated
@ -22,2 +21,3 @@
].contains(env.BRANCH_NAME)
]
TARGET_BRANCH = PROTECTED_BRANCH.find { it == env.CHANGE_TARGET } ?: "dev"
juan commented 2025-02-21 14:09:21 +00:00
Owner
Copy Link

COMPOSE_TAG , defineixla en el stage E2E

COMPOSE_TAG , defineixla en el stage E2E
alexm added 1 commit 2025-02-24 06:08:36 +00:00
alexm dismissed juan’s review 2025-02-24 06:08:36 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

alexm added 1 commit 2025-02-24 06:23:53 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
cf30dff905 ci: refs #6695 update Jenkinsfile to use double quotes for COMPOSE_TAG assignment
alexm added 1 commit 2025-02-24 06:24:40 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
e1d91a0b19 ci: refs #6695 update Jenkinsfile to use single quotes for COMPOSE_TAG assignment
juan requested changes 2025-02-24 08:14:30 +00:00
Dismissed
Jenkinsfile Outdated
@ -113,6 +113,7 @@ pipeline {
}
steps {
script {
COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
juan commented 2025-02-24 08:14:27 +00:00
Owner
Copy Link

Ficala en environment, si no no l'agafara

Ficala en environment, si no no l'agafara
juan requested changes 2025-02-24 08:20:49 +00:00
Dismissed
Jenkinsfile
@ -123,3 +124,3 @@
post {
always {
sh "docker-compose ${env.COMPOSE_PARAMS} down"
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
juan commented 2025-02-24 08:20:22 +00:00
Owner
Copy Link

Vols -v o era per a depurar?

Vols `-v` o era per a depurar?
alexm added 1 commit 2025-02-24 08:32:46 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ca2e8e89df ci: refs #6695 update Jenkinsfile to assign COMPOSE_TAG within the pipeline block
alexm added 1 commit 2025-02-24 08:34:33 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
bb4a919c10 ci: refs #6695 update Jenkinsfile to assign COMPOSE_TAG within the pipeline block
alexm requested review from juan 2025-02-24 08:39:13 +00:00
juan approved these changes 2025-02-24 08:43:37 +00:00
Dismissed
alexm added 1 commit 2025-02-24 11:29:27 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
b4563b1691 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-24 13:52:43 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
10dedc97ae Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-25 09:49:20 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
abecf9cf71 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-25 10:38:53 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
aca7d008a7 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-25 11:43:20 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
4008d33586 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 07:00:32 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2f22eda360 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 08:37:41 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
922d5ff44d Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 09:03:33 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
90b02c2e68 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 09:28:55 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
073ab3a1d4 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 09:31:34 +00:00
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
63293d550e Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-26 12:59:55 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
10da670c24 Merge branch 'dev' into 6695-fix_CHANGE_TARGET
alexm added 1 commit 2025-02-27 06:43:48 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
c053a4d2bd Merge branch 'dev' into 6695-fix_CHANGE_TARGET
juan approved these changes 2025-02-27 08:13:13 +00:00
alexm merged commit faac7a0354 into dev 2025-02-27 08:22:36 +00:00
alexm deleted branch 6695-fix_CHANGE_TARGET 2025-02-27 08:22:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#1466
No description provided.
Delete Branch "6695-fix_CHANGE_TARGET"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?