Skip to content

Commit 63fe6fd

Browse files
committed
Fix merge action to vonvert once not twice
1 parent c6c1d91 commit 63fe6fd

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

.github/workflows/ci-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
workflow_dispatch:
1616

1717
env:
18-
FORCE_COLOR: "1" # Make tool output pretty.
1918
PIP_DISABLE_PIP_VERSION_CHECK: "1"
2019
PIP_PROGRESS_BAR: "off"
2120
LOGLEVEL: "DEBUG"

.github/workflows/merge.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
# install tagged version
6868
# python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.0rc2
6969
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main
70+
voc4cat --version
7071
7172
# install custom pylode 2.x
7273
python -m pip install git+https://github.com/dalito/pyLODE.git@nfdi4cat-2.x
@@ -79,7 +80,6 @@ jobs:
7980
8081
- name: Run voc4cat (publish joined & split SKOS/turtle)
8182
run: |
82-
voc4cat --version
8383
mkdir -p publish/dev/
8484
# delete files xlsx and ttl produced in previous workflow runs
8585
find publish/dev/ -type f \( -name "*.xlsx" -o -name "*.ttl" \) -delete
@@ -96,11 +96,9 @@ jobs:
9696
- name: Run voc4cat (build current Excel file)
9797
# Passing the config is important to make use of the prefixes therein.
9898
run: |
99-
voc4cat convert --config idranges.toml --logfile publish/dev/voc4cat.log --template templates/voc4cat_template_043.xlsx publish/dev/
100-
10199
# Choose the conversion either with or without an xlsx template
102100
voc4cat convert --config idranges.toml --logfile publish/dev/voc4cat.log publish/dev/
103-
# voc4cat convert --config idranges.toml --logfile publish/dev/voc4cat.log --template templates/voc4cat_template_v1.0.xlsx publish/dev/
101+
# voc4cat convert --config idranges.toml --logfile publish/dev/voc4cat.log --template templates/default_sheets.xlsx publish/dev/
104102
105103
- name: Deploy updated gh-pages content
106104
# This replaces all prior content in gh-pages branch. But we have

0 commit comments

Comments
 (0)