diff --git a/.github/workflows/build-deb.yaml b/.github/workflows/build-deb.yaml index 283d3bea..bae364c5 100644 --- a/.github/workflows/build-deb.yaml +++ b/.github/workflows/build-deb.yaml @@ -48,9 +48,6 @@ jobs: - name: Mark working directory as safe run: git config --global --add safe.directory $GITHUB_WORKSPACE - - name: Fetch all branches - run: git fetch --tags - - name: update branch name run: | safe_branch=$(echo "${GITHUB_REF_NAME}" | tr '/' '-') @@ -72,7 +69,7 @@ jobs: - name: Collect .deb artifact run: | mkdir -p artifacts/${{ matrix.os }}/${{ matrix.version }} - mv ../libosal_*.deb artifacts/${{ matrix.os }}/${{ matrix.version }} + mv ../libosal*.deb artifacts/${{ matrix.os }}/${{ matrix.version }} - name: Set sanitized image name id: sanitize @@ -88,11 +85,6 @@ jobs: name: libosal-${{ steps.sanitize.outputs.sanitized_image }}.deb path: artifacts/${{ matrix.os }}/${{ matrix.version }}/*.deb - - name: Ensure package is present - run: | - echo "Files in workspace:" - find * - - name: Upload to Cloudsmith (${{ matrix.os }}/${{ matrix.version }}) env: CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} @@ -100,6 +92,7 @@ jobs: run: | VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: //p') FILENAME="artifacts/${{ matrix.os }}/${{ matrix.version }}/libosal_${VERSION}_amd64.deb" + FILENAME_DEV="artifacts/${{ matrix.os }}/${{ matrix.version }}/libosal-dev_${VERSION}_amd64.deb" python3 -m venv cloudsmith cd cloudsmith @@ -108,30 +101,10 @@ jobs: python3 -m pip install --upgrade pip pip3 install cloudsmith-cli - cloudsmith push deb robert-burger-AdLL/common/${{ matrix.os }}/${{ matrix.version }} ../${FILENAME} \ + cloudsmith push deb robertburger/common/${{ matrix.os }}/${{ matrix.version }} ../${FILENAME} \ --republish \ --api-key "$CLOUDSMITH_API_KEY" - - - name: Collect devel .deb artifact - run: | - mkdir -p artifacts/${{ matrix.os }}/${{ matrix.version }} - mv ../libosal-dev*.deb artifacts/${{ matrix.os }}/${{ matrix.version }} - - name: Upload devel to Cloudsmith (${{ matrix.os }}/${{ matrix.version }}) - env: - CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} - shell: bash - run: | - VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: //p') - FILENAME="artifacts/${{ matrix.os }}/${{ matrix.version }}/libosal-dev_${VERSION}_amd64.deb" - - python3 -m venv cloudsmith - cd cloudsmith - source bin/activate - - python3 -m pip install --upgrade pip - pip3 install cloudsmith-cli - - cloudsmith push deb robert-burger-AdLL/common/${{ matrix.os }}/${{ matrix.version }} ../${FILENAME} \ + cloudsmith push deb robertburger/common/${{ matrix.os }}/${{ matrix.version }} ../${FILENAME_DEV} \ --republish \ --api-key "$CLOUDSMITH_API_KEY"