Updated .gitlab-ci and Dockerfile

2025-11-02 07:44:27 -05:00 · 2022-02-09 22:25:34 +01:00
parent 94e594ae8b
commit d853151053
2 changed files with 88 additions and 88 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,10 @@ image: mcr.microsoft.com/dotnet/sdk:6.0
 stages:
  - build
  - test
-#  - upload-builds
+  - upload-builds
-#  - release
+  - release
-#  - publish-windows
+  - publish-windows
-#  - upload-windows-updater-release
+  - upload-windows-updater-release
 variables:
  project: "NadekoBot"
@@ -29,30 +29,30 @@ build:
      - "$LINUX_X64_OUTPUT_DIR/"
      - "$WIN_X64_OUTPUT_DIR/"
-#upload-builds:
+upload-builds:
-#  stage: upload-builds
+ stage: upload-builds
-#  image: alpine:latest
+ image: alpine:latest
-#  rules:
+ rules:
-#    - if: $CI_COMMIT_TAG
+   - if: $CI_COMMIT_TAG
-#  script:    
+ script:    
-#    - apk add --no-cache curl tar zip
+   - apk add --no-cache curl tar zip
-#    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
+   - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
-#    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
+   - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
-#    - |
+   - |
-#      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
+     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
-#    - |
+   - |
-#      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
+     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
-#release:
+release:
-#  stage: release
+ stage: release
-#  image: registry.gitlab.com/gitlab-org/release-cli:latest
+ image: registry.gitlab.com/gitlab-org/release-cli:latest
-#  rules:
+ rules:
-#    - if: $CI_COMMIT_TAG
+   - if: $CI_COMMIT_TAG
-#  script:
+ script:
-#    - |
+   - |
-#      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
+     release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
-#        --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
+       --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
-#        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
+       --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
 test:
  stage: test
@@ -62,64 +62,64 @@ test:
    - "cd $tests_path"
    - "dotnet test"
-#publish-windows:
+publish-windows:
-#  stage: publish-windows 
+ stage: publish-windows 
-#  rules:
+ rules:
-#    - if: '$CI_COMMIT_TAG'
+   - if: '$CI_COMMIT_TAG'
-#  image: scottyhardy/docker-wine
+ image: scottyhardy/docker-wine
-#  before_script:
+ before_script:
-#    - choco install dotnet-6.0-runtime -y
+   - choco install dotnet-6.0-runtime -y
-#    - choco install dotnet-6.0-sdk -y
+   - choco install dotnet-6.0-sdk -y
-#    - choco install innosetup -y
+   - choco install innosetup -y
-#  artifacts:
+ artifacts:
-#    paths:
+   paths:
-#      - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+     - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
-#  script:
+ script:
-#    - dotnet clean
+   - dotnet clean
-#    - dotnet restore
+   - dotnet restore
-#    - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
+   - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
-#    - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
+   - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
-#    - iscc.exe "/O+" ".\exe_builder.iss"
+   - iscc.exe "/O+" ".\exe_builder.iss"
-#  tags:
+ tags:
-#    - windows
+   - windows
-#upload-windows-updater-release:
+upload-windows-updater-release:
-#  stage: upload-windows-updater-release
+ stage: upload-windows-updater-release
-#  rules:
+ rules:
-#    - if: '$CI_COMMIT_TAG'
+   - if: '$CI_COMMIT_TAG'
-#  image: 
+ image: 
-#    name: amazon/aws-cli
+   name: amazon/aws-cli
-#    entrypoint: [""]
+   entrypoint: [""]
-#  script:  
+ script:  
-#    - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v4.json
+   - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v4.json
-#    - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v4.json
+   - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v4.json
-#    - aws --version
+   - aws --version
-#    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+   - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
-#    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v4.json" --acl public-read --body "releases-v4.json"
+   - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v4.json" --acl public-read --body "releases-v4.json"
-#docker-build:
+docker-build:
-#  # Use the official docker image.
+ # Use the official docker image.
-#  image: docker:latest
+ image: docker:latest
-#  stage: build
+ stage: build
-#  services:
+ services:
-#    - docker:dind
+   - docker:dind
-#  before_script:
+ before_script:
-#    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-#  # Default branch leaves tag empty (= latest tag)
+ # Default branch leaves tag empty (= latest tag)
-#  # All other branches are tagged with the escaped branch name (commit ref slug)
+ # All other branches are tagged with the escaped branch name (commit ref slug)
-#  script:
+ script:
-#    - |
+   - |
-#      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+     if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-#        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_REF_SLUG"
-#        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}" .
-#    - docker push "$CI_REGISTRY_IMAGE${tag}"
+   - docker push "$CI_REGISTRY_IMAGE${tag}"
-#  # Run this job in a branch where a Dockerfile exists
+ # Run this job in a branch where a Dockerfile exists
-#  rules:
+ rules:
-#    - if: $CI_COMMIT_BRANCH
+   - if: $CI_COMMIT_BRANCH
-#      exists:
+     exists:
-#        - Dockerfile
+       - Dockerfile
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0-buster-slim AS build
 WORKDIR /source
 COPY src/NadekoBot/*.csproj src/NadekoBot/
@@ -18,7 +18,7 @@ RUN set -xe; \
    chmod +x /app/NadekoBot
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:5.0-buster-slim
+FROM mcr.microsoft.com/dotnet/runtime:6.0-buster-slim
 WORKDIR /app
 RUN set -xe; \