diff --git a/.github/workflows/build_rpm.yml b/.github/workflows/build_rpm.yml index 78d7a167..1cd40d45 100644 --- a/.github/workflows/build_rpm.yml +++ b/.github/workflows/build_rpm.yml @@ -3,10 +3,10 @@ name: build rpm on: pull_request: branches: - - master + - "*" push: branches: - - master + - "*" jobs: build-and-package-x86_64: @@ -28,7 +28,7 @@ jobs: - name: Set up RPM build env run: | - sudo apt-get update && sudo apt-get install -y rpm + sudo apt-get update && sudo apt-get install -y rpm alien fakeroot - name: Build package run: | @@ -38,9 +38,17 @@ jobs: cat ./rpm/oceanbase-diagnostic-tool.spec rpmbuild -bb ./rpm/oceanbase-diagnostic-tool.spec - - name: 'Upload Artifact' + - name: Convert RPM to DEB + run: | + mkdir -p /home/runner/artifacts + fakeroot alien --scripts --to-deb /home/runner/rpmbuild/RPMS/x86_64/oceanbase-diagnostic-tool-*.rpm + + - name: 'Upload Artifacts' uses: actions/upload-artifact@v3 with: - name: obdiag - path: /home/runner/rpmbuild/RPMS/x86_64/oceanbase-diagnostic-tool-*.rpm - retention-days: 3 \ No newline at end of file + name: obdiag-packages + path: | + /home/runner/rpmbuild/RPMS/x86_64/oceanbase-diagnostic-tool-*.rpm + /home/runner/work/oceanbase-diagnostic-tool/oceanbase-diagnostic-tool/oceanbase-diagnostic-tool_*.deb + retention-days: 3 + debug: true \ No newline at end of file diff --git a/requirements3.txt b/requirements3.txt index ef1ff40d..6ca1831e 100644 --- a/requirements3.txt +++ b/requirements3.txt @@ -20,7 +20,7 @@ zstandard==0.17.0 pycryptodome~=3.14.1 pick==1.2.0 PyYAML==6.0 -prettytable==3.5.0 +prettytable==3.10.0 oyaml==1.0 xmltodict==0.13.0 subprocess32==3.5.4