deployer3000
/
test-ci-cd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Merge pull request 'rc' (#15) from rc into main

pull/23/head
deployer3000 2025-04-09 17:34:11 +03:00
parent e10bb09d7b 618c0caed0
commit 8f80603f78
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -86,6 +86,7 @@ pipeline {
if (env.CHANGE_BRANCH?.startsWith('rc')) { if (env.CHANGE_BRANCH?.startsWith('rc')) {
echo "Attempting to merge PR ${env.CHANGE_ID} into master..." echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) { withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
def prId = env.CHANGE_ID def prId = env.CHANGE_ID
@ -98,7 +99,6 @@ pipeline {
""" """
echo "PR ${prId} merged successfully into main!" echo "PR ${prId} merged successfully into main!"
def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
echo "Merge commit hash: ${mergeCommitHash}" echo "Merge commit hash: ${mergeCommitHash}"
sh """ sh """
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \ curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \

1
README.md
View File

@ -3,3 +3,4 @@
```bash ```bash
docker build -t test-ci-cd . docker build -t test-ci-cd .
docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
kakak3