Skip to content

Commit

Permalink
merge: Merge pull request #22 from DSD-DBS/dirty-ci
Browse files Browse the repository at this point in the history
Avoid dirtying the worktree
  • Loading branch information
ewuerger authored Nov 3, 2023
2 parents d344902 + 7a5da4f commit 9d1d890
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
- name: Add git PAT
run: |-
git config --global --add url."https://${{ secrets.PAT_GITHUB }}@github".insteadOf https://github
- name: Pre-install private Github dependencies
run: |-
python -m pip install git+https://github.com/DSD-DBS/[email protected]
- name: Install test dependencies
run: |-
python -m pip install '.[test]'
Expand Down
13 changes: 0 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ stages:
- test
- deploy

.patch-pyproject-toml: &patch-pyproject-toml
- sed -i -e 's/\(^ "polarion-rest-api-client\).*",/\1",/' pyproject.toml

wheel:
stage: build
extends: .wheel
before_script:
- *patch-pyproject-toml

pages:
stage: build
Expand All @@ -22,33 +17,25 @@ pages:
OUTPUT_DIR: public
SPHINX_DEPENDENCIES: ".[docs]"
only: [main]
before_script:
- *patch-pyproject-toml

pages:test:
extends: pages
variables:
OUTPUT_DIR: pages-test
only: []
except: [main]
before_script:
- *patch-pyproject-toml

coverage:
stage: test
extends: .coverage
variables:
COVERAGE_SOURCE: capella2polarion
needs: []
before_script:
- *patch-pyproject-toml

pre-commit:
stage: test
extends: .pre-commit
needs: []
before_script:
- *patch-pyproject-toml

artifactory:
stage: deploy
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"capellambse",
"click",
"PyYAML",
"polarion-rest-api-client @ git+https://github.com/DSD-DBS/polarion-rest-api-client.git@v0.2.1",
"polarion-rest-api-client==0.2.1",
"requests",
]

Expand Down

0 comments on commit 9d1d890

Please sign in to comment.