Merge branch 'master' of git.mycard.moe:mycard/ImgGen

.gitlab-ci.yml

 stages:
   - build
+  - pack
   - deploy
   
 variables:
@@ -7,23 +8,16 @@ variables:
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
-#build:
-#  stage: build
-#  dependencies: []
-#  tags:
-#    - linux
-#  image: mono
-#  script:
-#    - sed -i '/download.mono-project.com/d' /etc/apt/sources.list /etc/apt/sources.list.d/*
-#    - apt update && apt -y install p7zip-full tar
-#    - xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v2.0
-#    - mkdir dist
-#    - cd bin/Release
-#    - 7z a -mx9 ../../dist/ImgGen.7z *
-#    - cd ../..
-#  artifacts:
-#    paths:
-#      - dist/
+build:
+  stage: build
+  dependencies: []
+  tags:
+    - vs
+  script:
+    - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" ImgGen.sln /m /p:Configuration=Release'
+  artifacts:
+    paths:
+      - bin/Release
 
 docker:
   stage: build
@@ -34,18 +28,31 @@ docker:
     - docker build --pull --no-cache -t $CONTAINER_TEST_IMAGE .
     - docker push $CONTAINER_TEST_IMAGE
 
-#upload_to_minio:
-#  stage: deploy
-#  dependencies:
-#    - build
-#  tags: 
-#    - linux
-#  image: python
-#  script:
-#    - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli
-#    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/ImgGen
-#  only:
-#    - master
+pack:
+  stage: pack
+  dependencies:
+    - build
+  tags:
+    - linux
+  script:
+    - mkdir dist
+    - cd bin/Release
+    - 7z a -mx9 ../../dist/ImgGen.7z *
+    - cd ../..
+  artifacts:
+    paths:
+      - dist
+
+upload_to_minio:
+  stage: deploy
+  dependencies:
+    - pack
+  tags: 
+    - linux
+  script:
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/ImgGen
+  only:
+    - master
 
 deploy_docker:
   stage: deploy

Dockerfile

-FROM debian:buster-slim as sqlite-builder
+FROM debian:bullseye-slim as sqlite-builder
 
 RUN apt-get update && \
 	apt-get -y install wget sqlite3 libsqlite3-dev p7zip-full mono-complete && \
@@ -9,7 +9,7 @@ RUN wget https://minio.mycard.moe:9000/nanahira/sqlite-netFx-full-source-1.0.112
 	cd sqlite && \
 	xbuild /p:Configuration=Release /p:UseInteropDll=false /p:UseSqliteStandard=true ./System.Data.SQLite/System.Data.SQLite.2015.csproj
 
-FROM debian:buster-slim as builder
+FROM debian:bullseye-slim as builder
 
 RUN apt-get update && \
 	apt-get -y install mono-complete && \
@@ -20,7 +20,7 @@ WORKDIR /ImgGen
 COPY --from=sqlite-builder /sqlite/bin/2015/ReleaseMonoOnPosix/bin/System.Data.SQLite.dll .
 RUN xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.6
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN apt-get update && \
 	apt-get -y install wget p7zip-full mono-complete xfonts-utils fontconfig && \