Commit cddcce09 authored by mercury233's avatar mercury233

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

parents d6359d2f 03fa5368
Pipeline #21488 passed with stages
in 6 minutes and 24 seconds
stages: stages:
- build - build
- pack
- deploy - deploy
variables: variables:
...@@ -7,23 +8,16 @@ variables: ...@@ -7,23 +8,16 @@ variables:
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
#build: build:
# stage: build stage: build
# dependencies: [] dependencies: []
# tags: tags:
# - linux - vs
# image: mono script:
# script: - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" ImgGen.sln /m /p:Configuration=Release'
# - sed -i '/download.mono-project.com/d' /etc/apt/sources.list /etc/apt/sources.list.d/* artifacts:
# - apt update && apt -y install p7zip-full tar paths:
# - xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v2.0 - bin/Release
# - mkdir dist
# - cd bin/Release
# - 7z a -mx9 ../../dist/ImgGen.7z *
# - cd ../..
# artifacts:
# paths:
# - dist/
docker: docker:
stage: build stage: build
...@@ -34,18 +28,31 @@ docker: ...@@ -34,18 +28,31 @@ docker:
- docker build --pull --no-cache -t $CONTAINER_TEST_IMAGE . - docker build --pull --no-cache -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE - docker push $CONTAINER_TEST_IMAGE
#upload_to_minio: pack:
# stage: deploy stage: pack
# dependencies: dependencies:
# - build - build
# tags: tags:
# - linux - linux
# image: python script:
# script: - mkdir dist
# - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli - cd bin/Release
# - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/ImgGen - 7z a -mx9 ../../dist/ImgGen.7z *
# only: - cd ../..
# - master 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: deploy_docker:
stage: deploy stage: deploy
......
FROM debian:buster-slim as sqlite-builder FROM debian:bullseye-slim as sqlite-builder
RUN apt-get update && \ RUN apt-get update && \
apt-get -y install wget sqlite3 libsqlite3-dev p7zip-full mono-complete && \ 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 ...@@ -9,7 +9,7 @@ RUN wget https://minio.mycard.moe:9000/nanahira/sqlite-netFx-full-source-1.0.112
cd sqlite && \ cd sqlite && \
xbuild /p:Configuration=Release /p:UseInteropDll=false /p:UseSqliteStandard=true ./System.Data.SQLite/System.Data.SQLite.2015.csproj 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 && \ RUN apt-get update && \
apt-get -y install mono-complete && \ apt-get -y install mono-complete && \
...@@ -20,7 +20,7 @@ WORKDIR /ImgGen ...@@ -20,7 +20,7 @@ WORKDIR /ImgGen
COPY --from=sqlite-builder /sqlite/bin/2015/ReleaseMonoOnPosix/bin/System.Data.SQLite.dll . COPY --from=sqlite-builder /sqlite/bin/2015/ReleaseMonoOnPosix/bin/System.Data.SQLite.dll .
RUN xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 RUN xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.6
FROM debian:buster-slim FROM debian:bullseye-slim
RUN apt-get update && \ RUN apt-get update && \
apt-get -y install wget p7zip-full mono-complete xfonts-utils fontconfig && \ apt-get -y install wget p7zip-full mono-complete xfonts-utils fontconfig && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment