fix

vulsio · Feb 21, 2025 · 74fe67e · 74fe67e
1 parent 0335f8d
commit 74fe67e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/archive-raw.yml b/.github/workflows/archive-raw.yml
@@ -152,18 +152,14 @@ jobs:
  
       - name: Check out code
         uses: actions/checkout@v4
-        with:
-          ref: main
 
       - name: Check out fetch data repository
         run: |
           oras pull ghcr.io/${{ github.repository }}:vuls-data-raw-${{ matrix.target }}
-          tar -xf vuls-data-raw-${{ matrix.target }}.tar.zst
 
       - name: Decide to archive
         id: archive_check
         run: |
-          oras pull ghcr.io/${{ github.repository }}:vuls-data-raw-${{ matrix.target }}
           SIZE=$(ls -s --block-size=1 vuls-data-raw-${{ matrix.target }}.tar.zst | awk '{print $1;}')
           echo "repository size [KB]:" $(( ${SIZE} / 1024 ))
           echo "repository size [MB]:" $(( ${SIZE} / 1024 / 1024 ))
@@ -177,14 +173,26 @@ jobs:
         run: |
           ARCHIVE_SUFFIX=$(./scripts/split-git.sh vuls-data-raw-${{ matrix.target }})
           echo "archive_suffix=${ARCHIVE_SUFFIX}" >> $GITHUB_OUTPUT
-  
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to GitHub Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Push archive dotgit
         if: steps.archive_check.outputs.do_archive == 'true'
         run: |
           ARCHIVE_SUFFIX=$(./scripts/split-git.sh vuls-data-raw-${{ matrix.target }})
           oras push ghcr.io/vulsio/vuls-data-db:vuls-data-raw-${{ matrix.target }}-${{ steps.split_archive.outputs.archive_suffix }} vuls-data-raw-${{ matrix.target }}-${{ steps.split_archive.outputs.archive_suffix }}.tar.zst:application/vnd.vulsio.vuls-data-db.dotgit.layer.v1.tar+zstd
-  
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Push latest dotgit
         if: steps.archive_check.outputs.do_archive == 'true'
         run: |
           oras push ghcr.io/vulsio/vuls-data-db:vuls-data-raw-${{ matrix.target }} vuls-data-raw-${{ matrix.target }}.tar.zst:application/vnd.vulsio.vuls-data-db.dotgit.layer.v1.tar+zstd
+  
diff --git a/scripts/split-git.sh b/scripts/split-git.sh
@@ -20,11 +20,13 @@ ARCHIVE_MAX=$(
 )
 
 ARCHIVE_SUFFIX=archive-$(( ${ARCHIVE_MAX} + 1 ))
+echo "ARCHIVE_SUFFIX=${ARCHIVE_SUFFIX}" 1>&2
 
 tar -xf ${TARGET}.tar.zst
 mv ${TARGET}.tar.zst ${TARGET}-${ARCHIVE_SUFFIX}.tar.zst
 
 mv ${TARGET} ${TARGET}-${ARCHIVE_SUFFIX}
+echo "Create the latest repository..." 1>&2
 git clone --depth 1 --no-single-branch  --no-checkout --branch main file://${PWD}/${TARGET}-${ARCHIVE_SUFFIX} ${TARGET}
 tar --remove-files -acf ${TARGET}.tar.zst ${TARGET}