Skip to content

Commit 384f6a3

Browse files
authored
Refactor GitHub Actions workflow to remove duplicates
Removed duplicate step for replacing version placeholder
1 parent 51e3088 commit 384f6a3

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,23 @@ jobs:
4646
#registry: registry.hub.docker.com
4747
username: wurstbrot
4848
password: ${{ secrets.HUB_TOKEN }}
49+
- name: Extract generated files from docker image
50+
run: |
51+
yamlVersion=$(cat Dockerfile | grep dsomm-yaml | sed 's#.*:##g' | sed 's# .*##g')
52+
mkdir generated || true
53+
docker run -d --name=yaml --entrypoint="/bin/sleep" wurstbrot/dsomm-yaml-generation:${yamlVersion} 60
54+
docker cp yaml:/var/www/html/generated/model.yaml generated/model.yaml
55+
docker cp yaml:/var/www/html/generated/dependency-tree.md generated/dependency-tree.md
56+
- name: Replace version placeholder in model.yaml
57+
run: |
58+
sed -i "s/__VERSION_PLACEHOLDER__/${{ steps.get-version.outputs.version }}/g" src/assets/YAML/model.yaml
4959
- name: create and push yaml image
5060
uses: docker/build-push-action@v3
5161
with:
5262
push: true
5363
file: Dockerfile
5464
platforms: linux/amd64,linux/arm64
5565
tags: wurstbrot/dsomm-yaml-generation:${{ steps.get-version.outputs.version }},wurstbrot/dsomm-yaml-generation:latest
56-
- name: Replace version placeholder in model.yaml
57-
run: |
58-
sed -i "s/__VERSION_PLACEHOLDER__/${{ steps.get-version.outputs.version }}/g" src/assets/YAML/model.yaml
5966
- name: Commit all changed files back to the repository
6067
uses: planetscale/ghcommit-action@v0.1.6
6168
with:
@@ -65,10 +72,4 @@ jobs:
6572
env:
6673
GITHUB_TOKEN: ${{secrets.ACCESS_TOKEN}}
6774

68-
# - name: Extract generated files from docker image
69-
# run: |
70-
# yamlVersion=$(cat Dockerfile | grep dsomm-yaml | sed 's#.*:##g' | sed 's# .*##g')
71-
# mkdir generated || true
72-
# docker run -d --name=yaml --entrypoint="/bin/sleep" wurstbrot/dsomm-yaml-generation:${yamlVersion} 60
73-
# docker cp yaml:/var/www/html/generated/model.yaml generated/model.yaml
74-
# docker cp yaml:/var/www/html/generated/dependency-tree.md generated/dependency-tree.md
75+

0 commit comments

Comments
 (0)