Revert "Revert "chore: sync with terra 37""

This reverts commit 070ed44a78.
This commit is contained in:
windowsboy111
2023-04-12 18:29:46 +08:00
parent ee931c8deb
commit 5cb5cc4ffc
27 changed files with 455 additions and 17 deletions
+6 -2
View File
@@ -73,9 +73,13 @@ jobs:
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Notify Madoguchi (Success)
if: success()
if: success() && github.event_name != 'pull_request'
run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
- name: Notify Madoguchi (Failure)
if: cancelled() || failure()
if: ( cancelled() || failure() ) && github.event_name != 'pull_request'
run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+4
View File
@@ -42,6 +42,10 @@ jobs:
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Notify Madoguchi (Success)
if: success()
run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
-1
View File
@@ -3,7 +3,6 @@ set -x
dirs=$2
dirs=${dirs/\/pkg/}
export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"
for f in anda-build/rpm/rpms/*; do
n=$(lesspipe.sh $f | grep -E "Name\s*: " | sed "s@Name\s*: @@")
v=$(lesspipe.sh $f | grep -E "Version\s*: " | sed "s@Version\s*: @@")