From 2f2792fd7d337002dfe0edc9301bf41c1b9c19e0 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 15 Mar 2020 21:36:30 +0100 Subject: [PATCH] fix bad condition for creating a gitlab release from ci --- .gitignore | 2 ++ .gitlab-ci.yml | 6 ++-- README.md | 12 ++++---- setup/build-release.sh | 63 ++++++++++++++++++++++++++++-------------- setup/readme.md | 41 +++++++++++++-------------- setup/version.txt | 2 +- 6 files changed, 75 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 0c82206f..dda88e80 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ ppas.bat lazproj/coedit bin public +dcd +d-scanner diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6fc86ad..337b94af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,9 @@ release: - apt-get install -y rpm - apt-get install -y git - apt-get install -y zip - - curl ftp://freepascal.dfmk.hu/pub/lazarus/releases/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/fpc-laz_3.0.4-1_amd64.deb -O && apt install -y ./fpc-laz_3.0.4-1_amd64.deb - - curl ftp://freepascal.dfmk.hu/pub/lazarus/releases/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/fpc-src_3.0.4-2_amd64.deb -O && apt install -y ./fpc-src_3.0.4-2_amd64.deb - - curl ftp://freepascal.dfmk.hu/pub/lazarus/releases/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/lazarus-project_2.0.6-0_amd64.deb -O && apt install -y ./lazarus-project_2.0.6-0_amd64.deb + - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/fpc-laz_3.0.4-1_amd64.deb/download && apt install -y ./fpc-laz_3.0.4-1_amd64.deb + - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/fpc-src_3.0.4-2_amd64.deb/download && apt install -y ./fpc-src_3.0.4-2_amd64.deb + - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.6/lazarus-project_2.0.6-0_amd64.deb/download && apt install -y ./lazarus-project_2.0.6-0_amd64.deb script: - bash setup/build-release.sh artifacts: diff --git a/README.md b/README.md index 12a31aaf..3f313319 100644 --- a/README.md +++ b/README.md @@ -24,18 +24,18 @@ Dexed, the _D Extended EDitor_, is an IDE for the [D programming language](https ## Project information -- :bookmark: latest release: version 3.8.0, Tue 12 Mar 2020. +- :bookmark: latest release: version 3.8.1, Wed 18 Mar 2020. - :scroll: licensed under the terms of the Boost software license. - :dollar: Development can be supported with [Paypal donations](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AQDJVC39PJF7J). -## Download version 3.8.0 +## Download version 3.8.1 Download the zipped binaries or the zip that contains the setup program for you platform: -- :package: [setup program for Linux 64 bit](https://gitlab.com/basile.b/dexed/uploads/a2a446e3dab3a286cb7139d96d17fb19/dexed.3.8.0.linux64.setup.zip) -- :package: [binaries for Linux 64 bit](https://gitlab.com/basile.b/dexed/uploads/597520123ad479642be9aab519fdab9c/dexed.3.8.0.linux64.zip) -- :package: [rpm for Linux 64 bit](https://gitlab.com/basile.b/dexed/uploads/cacac39d9d5326d3393d0f3b4ff76676/dexed-3.8.0-0.x86_64.rpm) -- :package: [deb for Linux 64 bit](https://gitlab.com/basile.b/dexed/uploads/6c15bb9b229936b84899637bb535da9f/dexed-3.8.0.amd64.deb) +- :package: [setup program for Linux 64 bit](https://gitlab.com/basile.b/dexed/releases/v3.8.1/downloads/binaries/dexed.3.8.1.linux64.setup.zip) +- :package: [binaries for Linux 64 bit](https://gitlab.com/basile.b/dexed/releases/v3.8.1/downloads/binaries/dexed.3.8.1.linux64.zip) +- :package: [rpm for Linux 64 bit](https://gitlab.com/basile.b/dexed/releases/v3.8.1/downloads/binaries/dexed-3.8.1-0.x86_64.rpm) +- :package: [deb for Linux 64 bit](https://gitlab.com/basile.b/dexed/releases/v3.8.1/downloads/binaries/dexed-3.8.1.amd64.deb) The _zip_ archives allow to move freely the files. The _setup.zip_ archives contain a command line program that installs to predefined locations so that the software can be run without additional intervention. diff --git a/setup/build-release.sh b/setup/build-release.sh index 9b10d8a3..1a92ff81 100644 --- a/setup/build-release.sh +++ b/setup/build-release.sh @@ -4,6 +4,8 @@ set -e export DC=ldc2 semver=$(cat setup/version.txt) ver=${semver:1:100} +dcd_ver="" +dscanner_ver="" echo "building dexed release" $ver # dastworx @@ -21,27 +23,45 @@ cd .. # dcd echo "building dcd..." -git clone https://github.com/dlang-community/dcd.git -cd dcd +if [ ! -d dcd ]; then + git clone https://github.com/dlang-community/dcd.git + cd dcd +else + cd dcd + git pull +fi git submodule update --init --recursive git fetch --tags +if [ ! -z "$dcd_ver" ]; then + git checkout $dcd_ver +fi make ldc echo "...done" cd .. # dscanner echo "building dscanner..." -git clone https://github.com/dlang-community/d-scanner.git -cd d-scanner +if [ ! -d d-scanner ]; then + git clone https://github.com/dlang-community/d-scanner.git + cd d-scanner +else + cd d-scanner + git pull +fi git submodule update --init --recursive git fetch --tags +if [ ! -z "$dscanner_ver" ]; then + git checkout $dscanner_ver +fi make ldc echo "...done" cd .. # move to setup dir echo "moving files and binaries..." -mkdir setup/nux64 +if [ ! -d setup/nux64 ]; then + mkdir setup/nux64 +fi mv bin/dastworx setup/nux64/ mv bin/dexed setup/nux64/ mv dcd/bin/dcd-server setup/nux64/ @@ -58,7 +78,7 @@ cd setup echo "building the RPM..." bash rpm.sh echo "...done" -echo "building the DEV..." +echo "building the DEB..." bash deb.sh echo "...done" SETUP_APP_NAME="dexed.$ver.linux64.setup" @@ -75,23 +95,24 @@ echo "...done" if [ ! -z "$GITLAB_CI" ]; then # build links to the artifacts - # reminder: need to set the expiration date or click KEEP btn on the website UI - LNK_RPM=https://gitlab.com/basile.b/dexed/-/jobs/$CI_JOB_ID/artifacts/raw/setup/output/dexed-3.8.0-0.x86_64.rpm - LNK_DEB=https://gitlab.com/basile.b/dexed/-/jobs/$CI_JOB_ID/artifacts/raw/setup/output/dexed-3.8.0.amd64.deb - LNK_ZP1=https://gitlab.com/basile.b/dexed/-/jobs/$CI_JOB_ID/artifacts/raw/setup/output/dexed.3.8.0.linux64.setup.zip - LNK_ZP2=https://gitlab.com/basile.b/dexed/-/jobs/$CI_JOB_ID/artifacts/raw/setup/output/dexed.3.8.0.linux64.zip + LNK_BASE="https://gitlab.com/basile.b/dexed/-/jobs/$CI_JOB_ID/artifacts/raw/setup/output/" + RPM_NAME="dexed-$ver-0.x86_64.rpm" + DEB_NAME="dexed-$ver.amd64.deb" + ZP1_NAME="dexed.$ver.linux64.setup.zip" + ZP2_NAME="dexed.$ver.linux64.zip" - echo "asset1: " $LNK_RPM - echo "asset2: " $LNK_DEB - echo "asset3: " $LNK_ZP1 - echo "asset4: " $LNK_ZP2 + ASSET_RPM='{ "name" : "'$RPM_NAME'" , "url" : "'$LNK_BASE$RPM_NAME'" , "filepath" : "/binaries/'$RPM_NAME'" }' + ASSET_DEB='{ "name" : "'$DEB_NAME'" , "url" : "'$LNK_BASE$DEB_NAME'" , "filepath" : "/binaries/'$DEB_NAME'" }' + ASSET_ZP1='{ "name" : "'$ZP1_NAME'" , "url" : "'$LNK_BASE$ZP1_NAME'" , "filepath" : "/binaries/'$ZP1_NAME'" }' + ASSET_ZP2='{ "name" : "'$ZP2_NAME'" , "url" : "'$LNK_BASE$ZP2_NAME'" , "filepath" : "/binaries/'$ZP2_NAME'" }' + REQ_DATA='{ "name" : "'$semver'", "tag_name": "'$semver'", "description": "changelog coming soon", "assets": { "links": [ '$ASSET_RPM' , '$ASSET_DEB' , '$ASSET_ZP1' , '$ASSET_ZP2'] } }' + # create Gitlab release - if [ ! -z "$CI_MERGE_REQUEST_ID" ]; then - - curl --header 'Content-Type: application/json' \ --header "PRIVATE-TOKEN:" $CI_JOB_TOKEN \ - --data '{ "name": "Dexed '$ver'", "tag_name": '$semver', "description": "changelog coming soon...",' \ - '"assets": { "links": [{"url": "'$LNK_RPM'" }, {"url": "'$LNK_DEB'" }, {"url": "'$LNK_ZP1'" }, {"url": "'$LNK_ZP2'" }] } }' \ - --request POST https://gitlab.com/api/v4/projects/15908229/releases + if [ -z "$CI_MERGE_REQUEST_ID" ]; then + curl -g --header 'Content-Type: application/json' \ + --header "PRIVATE-TOKEN: $PUB_DEXED_RLZ" \ + --data-raw "$REQ_DATA" \ + --request POST https://gitlab.com/api/v4/projects/15908229/releases fi fi diff --git a/setup/readme.md b/setup/readme.md index 4c9a227f..1de32a6d 100644 --- a/setup/readme.md +++ b/setup/readme.md @@ -1,27 +1,28 @@ -This folder contains the files necessary to make a dexed release. -The process is semi-automatic and achieved by compiling a project in dexed itself. +This folder contains the files necessary to manually build dexed and its toolchain or to build a dexed release -dexed setup program -=== +## Requirements -The dexed project (_cesetup.dxp_) creates the dexed setup program. -It contains 3 configurations named _win32_, _nux32_, _nux64. -Each takes the content of the matching sub-folder and puts it in the output folder, as an extraction program, -at compile time (using the `import(file)` expression). +### Building -The extraction program is then compressed by the post-build process, using the scripts named `setupzip-`. +- git +- ldc2 -Raw Zip -=== +### Releaseing -The shell scripts named `zip-` take the content of their matching sub-folder to make an archive. -They are proposed alternatively to the setup program. The scripts are launched automatically when the setup program is about to be compiled (as pre-build process). +- git +- ldc2 +- rpm +- dpkg +- zip -Todo by hand for each release -=== +## Build manually dexed and the toolchain -- change the text in the _version.txt_ file. -- change the setup program _version_ field. -- put the content (programs, icon, license, etc.) in each of the nux32/nux64/win32 folders. -- compile on each platform with the right project configuration. -- run the _rpm.sh_ and the _deb.sh_ scripts. +- in the project root directory `bash setup/build-release.sh` + +## Building a dexed release + +- add a git tag, update the occurences of the tag in the main readme. +- change the content of the _version.txt_ accordingly. +- in the project root directory `bash setup/build-release.sh` + +The installers are produced in the _output_ directory. diff --git a/setup/version.txt b/setup/version.txt index 40c06ccb..32f8572e 100644 --- a/setup/version.txt +++ b/setup/version.txt @@ -1 +1 @@ -v3.8.0 +v3.8.1