From 463ec9d09cebff7558fca136e465fceb72646b50 Mon Sep 17 00:00:00 2001 From: DeveloperDurpBot Date: Tue, 21 Nov 2023 20:19:05 +0000 Subject: [PATCH] ci: render Rendered by https://gitlab.com/developerdurp/yml/-/pipelines/1080699773 --- job-templates.yml | 10 ---------- jobs/octopus.yml | 13 ++++--------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/job-templates.yml b/job-templates.yml index a8c49e2..79c1344 100644 --- a/job-templates.yml +++ b/job-templates.yml @@ -47,14 +47,6 @@ render-job-templates-yml: git push -o ci.variable="CI_SCRIPTS_SKIP_PIPELINE=true" "https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" "HEAD:$CI_COMMIT_BRANCH" curl --silent --fail --request POST --form token="$CI_JOB_TOKEN" --form ref="$CI_COMMIT_BRANCH" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/trigger/pipeline" >/dev/null # End of commit-and-push-changes.sh - rules: - - if: $CI_COMMIT_BRANCH - changes: - - .gitlab-ci.yml - - scripts/** - - templates/** - - job-templates.yml - - job-templates.tpl.yml render-pipelines-to-branch: stage: render script: @@ -91,5 +83,3 @@ render-pipelines-to-branch: git push -o ci.variable="CI_SCRIPTS_SKIP_PIPELINE=true" "https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" "HEAD:$CI_COMMIT_BRANCH" curl --silent --fail --request POST --form token="$CI_JOB_TOKEN" --form ref="$CI_COMMIT_BRANCH" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/trigger/pipeline" >/dev/null # End of commit-and-push-changes.sh - rules: - - if: $CI_COMMIT_BRANCH =~ /^release*/ diff --git a/jobs/octopus.yml b/jobs/octopus.yml index 538fb98..c65f737 100644 --- a/jobs/octopus.yml +++ b/jobs/octopus.yml @@ -17,13 +17,8 @@ .octo_release: image: registry.durp.info/octopusdeploy/octo:latest script: - # Begin of pack.sh + # Begin of create_release.sh - | - #Package with octopus - mkdir $CI_PROJECT_DIR/packages - for dir in ./output/*/; - do dir=${dir%*/}; - dir=${dir##*/}; - dotnet /octo/octo.dll pack --id=$dir --version=$VERSION --outFolder=$CI_PROJECT_DIR/packages --basePath=$CI_PROJECT_DIR/output/$dir; - done - # End of pack.sh + #Octopus Create Release + dotnet /octo/octo.dll create-release --project="$OCTO_PROJECT_NAME" --releaseNumber=$VERSION --server=https://octopus.internal.durp.info/ --apiKey=$OCTOAPI --packagesFolder=$CI_PROJECT_DIR/packages + # End of create_release.sh