From 974a512a9d06b43b75e7e736a77db6fa1eca769e Mon Sep 17 00:00:00 2001 From: Michael Onken Date: Wed, 18 Oct 2023 17:05:35 +0200 Subject: [PATCH] Revert "List workspace content." This reverts commit 111f9ca5fb4f49606766877685bc0a3044fcc90c. --- .github/workflows/cmake-linux.yml | 40 ++++++++++++++----------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/cmake-linux.yml b/.github/workflows/cmake-linux.yml index e87fe02c..15a758d3 100644 --- a/.github/workflows/cmake-linux.yml +++ b/.github/workflows/cmake-linux.yml @@ -2,9 +2,9 @@ name: C/C++ CI Linux on: push: - branches: [ "testing" ] + branches: [ "master" ] pull_request: - branches: [ "testing" ] + branches: [ "master" ] permissions: deployments: write @@ -37,24 +37,20 @@ jobs: run: | cd docker && make dcmqi.test - - name: "Print dcmqi workspace folder" # TODO remove + - name: "Publish docker image" run: | - ls -R ${{ github.workspace }} - - # - name: "Publish docker image" - # run: | - # docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} && \ - # docker push fedorov/dcmqi:`git describe --tags --exact-match 2> /dev/null || echo "latest"` \ - # || echo "skipping docker push" - - # - name: "Publish linux package" - # run: | - # pip install -U "scikit-ci-addons>=0.22.0" - # # python -m scikit-ci publish --package-name dcmqi --package-version `git - # # describe --tags --exact-match 2> /dev/null || echo "latest"` --platform linux - # # --commit-range ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} --repository ${{ github.event.pull_request.head.repo.full_name }} --token ${{ secrets.GITHUB_TOKEN }} --verbose - # ci_addons publish_github_release QIICR/dcmqi \ - # --prerelease-packages "build/dcmqi-build/dcmqi-*-linux-*.tar.gz" \ - # --prerelease-packages-clear-pattern "dcmqi-*-linux-*" \ - # --prerelease-packages-keep-pattern "*-*" \ - # --exit-success-if-missing-token --token ${{ secrets.GA_TOKEN }} + docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} && \ + docker push fedorov/dcmqi:`git describe --tags --exact-match 2> /dev/null || echo "latest"` \ + || echo "skipping docker push" + + - name: "Publish linux package" + run: | + pip install -U "scikit-ci-addons>=0.22.0" + # python -m scikit-ci publish --package-name dcmqi --package-version `git + # describe --tags --exact-match 2> /dev/null || echo "latest"` --platform linux + # --commit-range ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} --repository ${{ github.event.pull_request.head.repo.full_name }} --token ${{ secrets.GITHUB_TOKEN }} --verbose + ci_addons publish_github_release QIICR/dcmqi \ + --prerelease-packages "build/dcmqi-build/dcmqi-*-linux-*.tar.gz" \ + --prerelease-packages-clear-pattern "dcmqi-*-linux-*" \ + --prerelease-packages-keep-pattern "*-*" \ + --exit-success-if-missing-token --token ${{ secrets.GA_TOKEN }}