diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 798fcdb..57d3247 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,9 +173,9 @@ EgwProxy.Ftp:build: APP_NAME: EgwProxy.Ftp rules: - if: $CI_COMMIT_BRANCH == 'develop' - changes: - - EgwProxy.Ftp/* - when: always + # changes: + # - EgwProxy.Ftp/* + # when: always - if: $CI_COMMIT_BRANCH == 'SDK/Ftp' changes: - EgwProxy.Ftp/* @@ -194,9 +194,9 @@ EgwProxy.Icoel:build: APP_NAME: EgwProxy.Icoel rules: - if: $CI_COMMIT_BRANCH == 'develop' - changes: - - EgwProxy.Icoel/* - when: always + # changes: + # - EgwProxy.Icoel/* + # when: always - if: $CI_COMMIT_BRANCH == 'SDK/Icoel' changes: - EgwProxy.Icoel/* @@ -215,9 +215,9 @@ EgwProxy.MultiCncLib:build: APP_NAME: EgwProxy.MultiCncLib rules: - if: $CI_COMMIT_BRANCH == 'develop' - changes: - - EgwProxy.MultiCncLib/* - when: always + # changes: + # - EgwProxy.MultiCncLib/* + # when: always - if: $CI_COMMIT_BRANCH == 'SDK/MultiCncLib' changes: - EgwProxy.MultiCncLib/* @@ -228,56 +228,68 @@ EgwProxy.MultiCncLib:build: script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' -# EgwProxy.OsaiCncLib:build: -# stage: build -# tags: -# - win -# variables: -# APP_NAME: EgwProxy.OsaiCncLib -# only: -# refs: -# - develop -# - SDK/OsaiCnc -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' +EgwProxy.OsaiCncLib:build: + stage: build + tags: + - win + variables: + APP_NAME: EgwProxy.OsaiCncLib + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + # changes: + # - EgwProxy.OsaiCncLib/* + # when: always + - if: $CI_COMMIT_BRANCH == 'SDK/OsaiCnc' + changes: + - EgwProxy.OsaiCncLib/* + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' -# EgwProxy.SqlDb:build: -# stage: build -# tags: -# - win -# variables: -# APP_NAME: EgwProxy.SqlDb -# only: -# refs: -# - develop -# - SDK/SqlDb -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' +EgwProxy.SqlDb:build: + stage: build + tags: + - win + variables: + APP_NAME: EgwProxy.SqlDb + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + # changes: + # - EgwProxy.SqlDb/* + # when: always + - if: $CI_COMMIT_BRANCH == 'SDK/SqlDb' + changes: + - EgwProxy.SqlDb/* + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' -# EgwProxy.Gomba:build: -# stage: build -# tags: -# - win -# variables: -# APP_NAME: EgwProxy.Gomba -# only: -# refs: -# - develop -# - SDK/Gomba -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' +EgwProxy.Gomba:build: + stage: build + tags: + - win + variables: + APP_NAME: EgwProxy.Gomba + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + # changes: + # - EgwProxy.Gomba/* + # when: always + - if: $CI_COMMIT_BRANCH == 'SDK/Gomba' + changes: + - EgwProxy.Gomba/* + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' # # --------------------------------