diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 41ce33e..c90b0ac 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -39,46 +39,23 @@ jobs: bash base-image-script/debian-${version}_pt1.sh done - - name: Calculate SHA256 checksums - run: | - echo "[DEBUG] Current working directory: $(pwd)" - find . -name 'debian-*.tar.bz2' -ls - - rm -f sha256sums.txt - shopt -s nullglob - for tarball in */debian-*.tar.bz2; do - echo "[INFO] Processing: $tarball" - checksum=$(sha256sum "$tarball" | awk '{print $1}') - echo "$checksum $tarball" >> sha256sums.txt - echo "[INFO] SHA256 for $tarball: $checksum" - done - - echo "[DEBUG] Contents of sha256sums.txt:" - cat sha256sums.txt - - name: List output archives run: | echo "[INFO] Looking for tarballs in workspace..." find . -name '*.tar.bz2' -exec ls -lh {} \; - - name: Debug workspace contents - run: | - echo "Current directory:" - pwd - echo "Contents:" - ls -R - - - name: Upload SHA256 checksums - uses: actions/upload-artifact@v3 - with: - name: sha256sums - path: sha256sums.txt + # - name: Debug workspace contents + # run: | + # echo "Current directory:" + # pwd + # echo "Contents:" + # ls -R push-archives-to-repo: needs: build-rootfs-archives runs-on: docker-build outputs: - archives_changed: ${{ steps.commit_archives.outputs.archives_changed }} + archives_changed: ${{ steps.commit_archives.outputs.archives_changed }} steps: - name: Checkout source uses: actions/checkout@v3 @@ -86,11 +63,6 @@ jobs: - name: Clone upload repo run: git clone "${{ env.REPO_URL }}" upload-repo - - name: Download SHA256 checksums - uses: actions/download-artifact@v3 - with: - name: sha256sums - - name: Clean old archives in upload-repo run: rm -rf upload-repo/*/*.tar.bz2 @@ -108,13 +80,19 @@ jobs: cp "$filepath" upload-repo/"$version_dir"/ done - - name: Copy sha256sums.txt to upload-repo + - name: Calculate and store sha256sums in upload-repo run: | - if [ -f sha256sums.txt ]; then - cp sha256sums.txt upload-repo/ - else - echo "[WARNING] sha256sums.txt not found" - fi + cd upload-repo + echo "[INFO] Calculating sha256sums..." + rm -f sha256sums.txt + for tarball in */debian-*.tar.bz2; do + echo "[INFO] Processing: $tarball" + checksum=$(sha256sum "$tarball" | awk '{print $1}') + echo "$checksum $tarball" >> sha256sums.txt + done + + echo "[INFO] SHA256 contents:" + cat sha256sums.txt - name: Commit and push files if changed id: commit_archives