Commit 0230b39b authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'main' 

+ added yang tools wrapper

See merge request !2
parents d931a723 11768bb5

.gitlab-ci.yml

+20 −16
Original line number Diff line number Diff line
@@ -44,8 +44,10 @@ variables: 
  BETA_KEY: "beta"

  MAIN_KEY: "stable"

  RELEASE_KEY: "beta"

  RELEASE_PATH: "public/updatesite/${RELEASE_KEY}"

  RELEASE_PAGE: "https://top.etsi.org/top-extras/updatesite/${RELEASE_KEY}"

  RELEASE_BASE_PATH: "public/updatesite"

  RELEASE_PATH: "${RELEASE_BASE_PATH}/${RELEASE_KEY}"

  RELEASE_BASE_URL: "https://top.etsi.org/top-extras/updatesite"

  RELEASE_PAGE: "${RELEASE_BASE_URL}/${RELEASE_KEY}"

  STANDALONE_LOCATION: "plugins/org.etsi.mts.tdl.standalone/target"

  STANDALONE_NAME: "org.etsi.mts.tdl.standalone-1.0.0-SNAPSHOT-shadow.jar"

  STANDALONE_PATH: "${STANDALONE_LOCATION}/${STANDALONE_NAME}"
@@ -236,26 +238,28 @@ pages: 
      artifacts: true

  script:

    # Get the previous GitLab Pages content (otherwise other beta/stable branch gets removed..)

    - rm -rf /var/lib/apt/lists/*

    - apt update

    - apt-cache gencaches

    - apt install -y zip unzip

    - zip --help

    - set +e

    - curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"

    - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi

    - set -e

    #- rm -rf /var/lib/apt/lists/*

    #- apt update

    #- apt-cache gencaches

    #- apt install -y zip unzip

    #- zip --help

    #- set +e

    #- curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"

    #- if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi

    #- set -e

    # Cleanup content? -> remove content in release path?

    # Add/update content

    - echo $CI_PAGES_URL

    - echo $RELEASE_PATH

    - mkdir -p $RELEASE_PATH

    - rm -rf $RELEASE_PATH/*

    #- rm -rf $RELEASE_PATH/*

    - chmod +x prepare.sh

    - ./prepare.sh $RELEASE_BASE_URL $RELEASE_KEY $SITE_PATH $RELEASE_BASE_PATH

    - cp -r -f $SITE_PATH/* $RELEASE_PATH 

    - ls -la $RELEASE_PATH

    - find $RELEASE_BASE_PATH

    # Zip the content and publish the zip again

    - zip -r "content.zip" "public"

    - mv "content.zip" "public/"

    #- zip -r "content.zip" "public"

    #- mv "content.zip" "public/"

    # - mv $SITE_ARCHIVE $RELEASE_PATH/content.zip

  artifacts:

    paths:

README.md

+3 −1
Original line number Diff line number Diff line 
# TOP: TDL Open source Project: Extras



This repository contains additional components for the TDL Open source Project (TOP). Currently it only includes a wrapper for the OpenAPI Generator. 

This repository contains additional components for the TDL Open source Project (TOP). Currently, it includes:

- a wrapper for the OpenAPI Generator

- a wrapper for the YANG Tools



More info at [TDL website](https://tdl.etsi.org)

features/org.etsi.mts.tdl.extras.feature/.project

+11 −0
Original line number Diff line number Diff line
@@ -20,4 +20,15 @@ 
		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.pde.FeatureNature</nature>

	</natures>

	<filteredResources>

		<filter>

			<id>1704887424736</id>

			<name></name>

			<type>30</type>

			<matcher>

				<id>org.eclipse.core.resources.regexFilterMatcher</id>

				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>

			</matcher>

		</filter>

	</filteredResources>

</projectDescription>

features/org.etsi.mts.tdl.extras.feature/feature.xml

+6 −0
Original line number Diff line number Diff line
@@ -314,5 +314,11 @@ any resulting litigation. 
         install-size="0"

         version="0.0.0"

         unpack="false"/>

   <plugin

         id="org.etsi.mts.tdl.extras.yang.tools.wrapper"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



</feature>

org.etsi.mts.tdl.extras.parent/.project

+11 −0
Original line number Diff line number Diff line
@@ -14,4 +14,15 @@ 
	<natures>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

	</natures>

	<filteredResources>

		<filter>

			<id>1704887424740</id>

			<name></name>

			<type>30</type>

			<matcher>

				<id>org.eclipse.core.resources.regexFilterMatcher</id>

				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>

			</matcher>

		</filter>

	</filteredResources>

</projectDescription>