From f8bffef63f7b17464db9e39855c095dc1699a25a Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 15 Dec 2024 16:41:23 +0800 Subject: [PATCH] fix(ci): server to madoguchi and subatomic --- .github/workflows/autobuild.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/json-build.yml | 4 ++-- .github/workflows/mg.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2b1dca41a1..3fdbeeb226 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -93,7 +93,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }} anda-build/rpm/rpms/* + terrael${{ matrix.version }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic if: github.event_name == 'push' @@ -101,7 +101,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }}-source anda-build/rpm/srpm/* + terrael${{ matrix.version }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() && github.event_name == 'push' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efe767f867..5db75cf913 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,14 +96,14 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }} anda-build/rpm/rpms/* + terrael${{ matrix.version }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic run: | subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }}-source anda-build/rpm/srpm/* + terrael${{ matrix.version }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index ba321b8c5d..89669cba2f 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -62,7 +62,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }} anda-build/rpm/rpms/* + terrael${{ matrix.version }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic if: github.event_name == 'push' @@ -70,7 +70,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra-el${{ matrix.version }}-source anda-build/rpm/srpm/* + terrael${{ matrix.version }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() diff --git a/.github/workflows/mg.sh b/.github/workflows/mg.sh index 3ade672a3e..a9654e265d 100755 --- a/.github/workflows/mg.sh +++ b/.github/workflows/mg.sh @@ -7,7 +7,7 @@ export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\": if [[ $1 == false ]]; then d=${p/\%v/?} d=${d/\%r/?} - curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra-el$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body + curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terrael$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body exit 0 fi @@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@") d=${p/\%v/$v} d=${d/\%r/$r} - curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra-el$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body + curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terrael$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body done