From 75a9fea3312402edb9f2850dfea5669172a90399 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 1 Dec 2024 21:17:05 +1100 Subject: [PATCH] feat: artifact changes - update build/deploy workflow --- .gitea/workflows/build.yaml | 8 ++++++++ .gitea/workflows/deploy.yaml | 21 +++++++++++++++++++++ rpms/ruff/0.8.1/release | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 3b2fb9d..9dd05ec 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,6 +2,8 @@ name: Build on: pull_request: + workflow_call: + workflow_dispatch: jobs: build: @@ -21,3 +23,9 @@ jobs: - name: Show RPMs run: | find /workspace -type f -name "*.rpm" + + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: rpms + path: /workspace/unkin/rpmbuilder/dist/*/*.rpm diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 71e1853..fbd527e 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -4,9 +4,13 @@ on: push: branches: - master + workflow_dispatch: jobs: build: + uses: ./.gitea/workflows/build.yml + + deploy: runs-on: almalinux-8 container: image: git.query.consul/unkin/almalinux8-runnerdnd:latest @@ -20,6 +24,23 @@ jobs: run: | make all + - name: Create dist directory + run: | + mkdir -p /tmp/unkin/rpmbuilder/dist + + - uses: actions/download-artifact@v3 + with: + name: rpms + path: /tmp/unkin/rpmbuilder/dist/ + + - name: Show RPMs from Artifacts + run: | + find /tmp -type f -name "*.rpm" + + - name: Show RPMs from Build + run: | + find /workspace -type f -name "*.rpm" + - name: Upload RPMs to Gitea env: DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }} diff --git a/rpms/ruff/0.8.1/release b/rpms/ruff/0.8.1/release index d00491f..0cfbf08 100644 --- a/rpms/ruff/0.8.1/release +++ b/rpms/ruff/0.8.1/release @@ -1 +1 @@ -1 +2 -- 2.47.3