diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36c704c6deb3ca5d9e49ba20f52b1396ebe14395..bd238f34b464c6d5515effe0a3ecd40f7a23873e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,66 +1,3 @@ -stages: - - build - - deploy - -variables: - AUTOBUILD_PACKAGE_DIR: libepoxy - AUTOBUILD_PACKAGE_NAME: libepoxy - AUTOBUILD_BUILD_ID: $CI_PIPELINE_ID - -build:windows: - stage: build - tags: - - autobuild - - windows - before_script: - - pipenv install - script: - - pipenv run autobuild install -A32 - - pipenv run autobuild build -A32 - - pipenv run autobuild package -A32 - artifacts: - paths: - - ${env:AUTOBUILD_PACKAGE_NAME}-*windows*.tar.bz2 - -build:windows64: - stage: build - tags: - - autobuild - - windows - before_script: - - pipenv install - script: - - pipenv run autobuild install -A64 - - pipenv run autobuild build -A64 - - pipenv run autobuild package -A64 - artifacts: - paths: - - ${env:AUTOBUILD_PACKAGE_NAME}-*windows64*.tar.bz2 - -build:linux64: - stage: build - image: r.alchemyviewer.org/alchemy/infrastructure/debian-build-image:latest - tags: - - linux - - docker - script: - - autobuild install -A64 - - autobuild build -A64 - - autobuild package -A64 - artifacts: - paths: - - $AUTOBUILD_PACKAGE_NAME-*linux64*.tar.bz2 - -deploy:nexus: - stage: deploy - tags: - - autobuild - - windows - when: manual - script: - - $FileNameLnx64 = Get-ChildItem -Path . -Name -Include ${env:AUTOBUILD_PACKAGE_NAME}-*-linux64-${env:AUTOBUILD_BUILD_ID}*.tar.bz2 - - curl.exe -v --user "${env:AUTOBUILD_HTTP_USER}:${env:AUTOBUILD_HTTP_PASS}" --upload-file .\$FileNameLnx64 "https://pkg.alchemyviewer.org/repository/autobuild-external/${env:AUTOBUILD_PACKAGE_DIR}/linux64/${FileNameLnx64}" - - $FileNameWin32 = Get-ChildItem -Path . -Name -Include ${env:AUTOBUILD_PACKAGE_NAME}-*-windows-${env:AUTOBUILD_BUILD_ID}*.tar.bz2 - - curl.exe -v --user "${env:AUTOBUILD_HTTP_USER}:${env:AUTOBUILD_HTTP_PASS}" --upload-file .\$FileNameWin32 "https://pkg.alchemyviewer.org/repository/autobuild-external/${env:AUTOBUILD_PACKAGE_DIR}/windows/${FileNameWin32}" - - $FileNameWin64 = Get-ChildItem -Path . -Name -Include ${env:AUTOBUILD_PACKAGE_NAME}-*-windows64-${env:AUTOBUILD_BUILD_ID}*.tar.bz2 - - curl.exe -v --user "${env:AUTOBUILD_HTTP_USER}:${env:AUTOBUILD_HTTP_PASS}" --upload-file .\$FileNameWin64 "https://pkg.alchemyviewer.org/repository/autobuild-external/${env:AUTOBUILD_PACKAGE_DIR}/windows64/${FileNameWin64}" +include: + - project: 'alchemy/infrastructure/gitlab-ci-config' + file: '3p-library.yml' diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 81e20cec2d5fe246b4236dbf35bbb5bdcce3d158..0000000000000000000000000000000000000000 --- a/Pipfile +++ /dev/null @@ -1,14 +0,0 @@ -[[source]] -url = "https://pypi.org/simple" -verify_ssl = true -name = "pypi" - -[dev-packages] - -[packages] -llbase = "*" -certifi = "*" -autobuild = {git = "https://git.alchemyviewer.org/alchemy/autobuild.git"} - -[requires] -python_version = "2.7" diff --git a/build-cmd.sh b/build-cmd.sh index ef1c7efb2b1bbbaef606c3c6c13fab533a9bda07..cd0ae0f2b3a2d3723aa6d6bdb56d1774e2ccfd33 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -34,8 +34,6 @@ EPOXY_SOURCE_DIR="$top/libepoxy" VERSION_HEADER_FILE="$EPOXY_SOURCE_DIR/_build_release/src/config.h" -build=${AUTOBUILD_BUILD_ID:=0} - # Create the staging folders mkdir -p "$stage/lib"/{debug,release,relwithdebinfo} mkdir -p "$stage/include/epoxy" @@ -142,4 +140,4 @@ version=`sed -n -E 's/#define PACKAGE_VERSION "([0-9])[.]([0-9])[.]([0-9]).*/\1. short="$(echo $version | cut -d"." -f1-2)" shortver="${short//.}" -echo "${version}.${build}" > "${stage}/VERSION.txt" +echo "${version}" > "${stage}/VERSION.txt"