Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results

Target

Select target project
No results found
Select Git revision
  • 18-implement-textgridlockmanager
  • 5-initial-setup-integration-junit-tests-for-tgapi
  • main
  • 1.0.0
  • 1.0.1
  • 1.0.2
  • 1.1.0
  • 1.1.1
  • 1.1.2
  • 1.1.3
  • 1.2.0
  • 1.2.1
  • 1.2.2
  • 1.2.3
  • 1.2.4
  • 1.2.5
  • 1.3.0
  • 1.3.1
  • 1.4.0
  • 1.4.1
  • 1.4.2
21 results
Show changes

Commits on Source 4

3 files
+ 28
− 8
Compare changes
  • Side-by-side
  • Inline

Files

.gitlab-ci.yml

+19 −6
Original line number Diff line number Diff line
@@ -56,10 +56,9 @@ build container image: 
    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    # always succeed and don't print error message

    - tag=$(git tag --contains $CI_COMMIT_SHORT_SHA 2>&1) || true

    # use tag for version if not empty; else commit sha

    - "[[ -n $tag ]] && export version=$tag || export version=$CI_COMMIT_SHORT_SHA"

    - "[[ -n ${CI_COMMIT_TAG} ]] && export version=${CI_COMMIT_TAG} || export version=${CI_COMMIT_SHORT_SHA}"

    - echo $version

    - mkdir -p /kaniko/.docker

    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"},\"$harbor_registry\":{\"auth\":\"$HARBOR_ROBOT_TOKEN64\"}}}" > /kaniko/.docker/config.json

    - /kaniko/executor
@@ -78,20 +77,33 @@ build container image: 
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_COMMIT_TAG



generate pipfile:

  stage: build

  image: docker.io/python:3.8-alpine

  before_script:

    - pip install pipenv

  script:

    - pipenv lock

  artifacts:

    paths:

      - Pipfile*

  needs: []

  rules:

    - if: $CI_COMMIT_TAG



generate app sbom:

  stage: deploy

  image: docker.io/node:18.12

  before_script:

    - npm ci --ignore-scripts

    - npm run build

  script:

    - npx cdxgen

      --type nodejs

      --required-only

      --type python

      --server-url https://deps.sub.uni-goettingen.de

      --api-key ${DEPS_UPLOAD_TOKEN}

      --project-name ${project_name}

      --project-version ${CI_COMMIT_TAG}

  needs: ["generate pipfile"]

  rules:

    - if: $CI_COMMIT_TAG
@@ -112,5 +124,6 @@ generate container sbom: 
      --form "projectName=${project_name}-container"

      --form "projectVersion=${CI_COMMIT_TAG}"

      --form "bom=@bom.json"'

  needs: ["build container image"]

  rules:

    - if: $CI_COMMIT_TAG

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
## [1.2.1](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.2.0...1.2.1) (2023-01-10)





### Bug Fixes



* reduce log level of some debug information ([c38b76b](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/commit/c38b76bc8199f72b1e1bcfb0bae014b605200849))



# [1.2.0](https://gitlab.gwdg.de/dariah-de/textgridrep/repdav/compare/1.1.3...1.2.0) (2023-01-09)

src/repdav/textgrid_named_dav_provider.py

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ class TextgridNamedProject(TextgridProject): 
                "extent": response.result[0].object_value.generic.generated.extent,

            }

        }

        _logger.info("INFO: %s", info)

        _logger.debug("INFO: %s", info)

        if "aggregation" in info[name]["format"]:

            return TextgridNamedAggregation(

                join_uri(self.path, name), self.environ, info, self._tgmeta
@@ -126,7 +126,7 @@ class TextgridNamedAggregation(TextgridAggregation): 
                "extent": response.result[0].object_value.generic.generated.extent,

            }

        }

        _logger.info("INFO: %s", info)

        _logger.debug("INFO: %s", info)

        if "aggregation" in info[name]["format"]:

            return TextgridNamedAggregation(

                join_uri(self.path, name), self.environ, info, self._tgmeta