From 159fdbf159794bc36c0ae14e609f427bce92b46a Mon Sep 17 00:00:00 2001
From: Kai Brassel <mail@khbrassel.de>
Date: Thu, 11 Mar 2021 17:25:32 +0100
Subject: [PATCH] Adapt to default gitlab pages deamon
---
.gitlab-ci.yml | 34 +++++++++-------------------------
README.md | 2 +-
2 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c0b950..20a7773 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,19 @@
-stages:
- - build
- - deploy
-
variables:
- EXPORT_DIR: "/var/www/html/pages"
- RELEASE_DIR: "$EXPORT_DIR/$CI_PROJECT_NAME/release_target_100"
+ RELEASE_DIR: "public/release_target_100"
-build-p2:
- stage: build
+pages:
+ stage: deploy
tags:
- docker # use shared runner
image: maven:3.6.3-adoptopenjdk-15
script:
- mvn --version
- - mvn clean install
- only:
- - master
+ - mvn clean install # build p2 repo
+ - rm -rf $RELEASE_DIR
+ - mkdir -p $RELEASE_DIR
+ - cp -r de.hftstuttgart.cityunits.p2site/target/repository/* $RELEASE_DIR
artifacts:
paths:
- - de.hftstuttgart.cityunits.p2site/target/repository/
- expire_in: 1 day
-
-pages-master:
- stage: deploy
- dependencies:
- - build-p2
- tags:
- - production # use special CLI runner for publishing to $EXPORT_DIR
- script:
- - rm -rf "$RELEASE_DIR"
- - mkdir -p "$RELEASE_DIR"
- - cp -r de.hftstuttgart.cityunits.p2site/target/repository/* "$RELEASE_DIR"
+ - public
only:
- - master
+ - master
diff --git a/README.md b/README.md
index c652348..d5c577d 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@
Create Eclipse P2 repository with Ecore data types for units based on Indriya reference implementation and some special units for urban simulation.
-To add OSGi bundles published in this P2 repository add site [https://transfer.hft-stuttgart.de/pages/de.hft-stuttgart.cityunits/release_target_100/]() to a running Eclipse instance via `Eclipse -> Preferences -> Install/Update -> Available Software Sites -> Add...` or to a target platform definition via `Eclipse -> Preferences -> Plug-in Development -> Target Platform -> Edit...`.
\ No newline at end of file
+To add OSGi bundles published in this P2 repository add site [https://transfer.hft-stuttgart.de/pages/neqmodplus/de.hft-stuttgart.cityunits/release_target_100/]() to a running Eclipse instance via `Eclipse -> Preferences -> Install/Update -> Available Software Sites -> Add...` or to a target platform definition via `Eclipse -> Preferences -> Plug-in Development -> Target Platform -> Edit...`.
--
GitLab