mirror of
				https://gitlab.com/Kwoth/nadekobot.git
				synced 2025-11-03 16:24:27 -05:00 
			
		
		
		
	Updated .gitlab-ci.yml. Fixed tags in Nadeko.Medusa and docker images
This commit is contained in:
		@@ -104,7 +104,7 @@ publish-medusa-package:
 | 
				
			|||||||
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 | 
					    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - LAST_TAG=$(git describe --tags --abbrev=0)
 | 
					    - LAST_TAG=$(git describe --tags --abbrev=0)
 | 
				
			||||||
    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_REF_SLUG"; fi
 | 
					    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHA"; fi
 | 
				
			||||||
    - cd src/Nadeko.Medusa/
 | 
					    - cd src/Nadeko.Medusa/
 | 
				
			||||||
    - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
 | 
					    - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
 | 
				
			||||||
    - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" 
 | 
					    - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" 
 | 
				
			||||||
@@ -125,7 +125,7 @@ docker-build:
 | 
				
			|||||||
        tag=""
 | 
					        tag=""
 | 
				
			||||||
        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
 | 
					        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
 | 
				
			||||||
      else
 | 
					      else
 | 
				
			||||||
        tag=":$CI_COMMIT_REF_SLUG"
 | 
					        tag=":$CI_COMMIT_SHA"
 | 
				
			||||||
        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
 | 
					        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
 | 
				
			||||||
      fi
 | 
					      fi
 | 
				
			||||||
    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
 | 
					    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user