Skip to content

Commit

Permalink
Merge pull request #36 from KSkwarczynski/feature_CI
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
jsobczyk authored Nov 16, 2024
2 parents 1fb778b + 47695a5 commit 0687042
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/CDImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ jobs:
if [ "${{ github.ref_type }}" == "tag" ]; then
docker build . \
--file "${{ matrix.file }}" \
--tag "ghcr.io/${{ github.repository_owner }}/nuwro:${{ matrix.os }}${{ github.ref_name }}" \
--build-arg NUWRO_VERSION="${{ github.ref_name }}" \
--tag "ghcr.io/nuwro/nuwro:${{ matrix.os }}${{ github.ref_name }}" \
--build-arg NUWRO_VERSION="${{ github.ref_name }}"
else
docker build . \
--file "${{ matrix.file }}" \
--tag "ghcr.io/${{ github.repository_owner }}/nuwro:${{ matrix.tag_latest }}" \
--build-arg NUWRO_VERSION="develop" \
--tag "ghcr.io/nuwro/nuwro:${{ matrix.tag_latest }}" \
--build-arg NUWRO_VERSION="master"
fi
- name: Push Docker image
run: |
if [ "${{ github.ref_type }}" == "tag" ]; then
docker push "ghcr.io/${{ github.repository_owner }}/nuwro:${{ matrix.os }}${{ github.ref_name }}"
docker push "ghcr.io/nuwro/nuwro:${{ matrix.os }}${{ github.ref_name }}"
else
docker push "ghcr.io/${{ github.repository_owner }}/nuwro:${{ matrix.tag_latest }}"
docker push "ghcr.io/nuwro/nuwro:${{ matrix.tag_latest }}"
fi
- name: Delete old images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CIBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

- name: Build the Docker image
run: docker build . --file ${{ matrix.file }} --tag ghcr.io/${{ github.repository_owner }}/nuwro:${{ matrix.tag }} --build-arg NUWRO_VERSION=${{ github.head_ref }}
run: docker build . --file ${{ matrix.file }} --tag ghcr.io/nuwro/nuwro:${{ matrix.tag }}

0 comments on commit 0687042

Please sign in to comment.