Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 0 additions & 263 deletions .circleci/config.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/package-apisix-deb-ubuntu20.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ jobs:

- name: run apisix packaging
run: |
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=24.04
make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=24.04

- name: install apisix deb into container
run: |
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/package-apisix-rpm-ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,17 @@ jobs:

- name: packaging APISIX(-remote) with remote code
run: |
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 artifact=apisix-remote
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 artifact=apisix-remote

- name: packaging APISIX(-local) with local code
run: |
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
./build-apisix-dashboard.sh ./apisix
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6 local_code_path=./apisix artifact=apisix-local

- name: run ubi8 docker and mapping rpm into container
- name: run ubi9 docker and mapping rpm into container
run: |
docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
docker run -itd -v $PWD/output:/output -v $(pwd)/test/apisix/config.yaml:/usr/local/apisix/conf/config.yaml --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash

- name: enable apisix repository in container
run: |
Expand All @@ -63,7 +61,7 @@ jobs:

- name: install APISIX(-remote) master by rpm in container
run: |
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi8.6.x86_64.rpm"
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-remote-master-0.ubi9.6.x86_64.rpm"
docker exec ubiInstance bash -c "apisix start"

- name: check and ensure APISIX(-remote) master is installed
Expand All @@ -82,7 +80,7 @@ jobs:

- name: install APISIX(-local) by rpm in container
run: |
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi8.6.x86_64.rpm"
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-local-master-0.ubi9.6.x86_64.rpm"
docker exec ubiInstance bash -c "apisix start"

- name: check and ensure APISIX(-local) is installed
Expand All @@ -102,7 +100,7 @@ jobs:
- name: Publish Artifact
uses: actions/[email protected]
with:
name: apisix-remote-master-0.ubi8.6.x86_64.rpm
path: output/apisix-remote-master-0.ubi8.6.x86_64.rpm
name: apisix-remote-master-0.ubi9.6.x86_64.rpm
path: output/apisix-remote-master-0.ubi9.6.x86_64.rpm
retention-days: 5
if-no-files-found: error
12 changes: 6 additions & 6 deletions .github/workflows/package-apisix-runtime-rpm-ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:

- name: build apisix-runtime rpm
run: |
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
make package type=rpm app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=registry.access.redhat.com/ubi9/ubi image_tag=9.6

- name: run ubi8 docker and mapping apisix-runtime rpm into container
- name: run ubi9 docker and mapping apisix-runtime rpm into container
run: |
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi8/ubi:8.6 /bin/bash
docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubiInstance --net="host" registry.access.redhat.com/ubi9/ubi:9.6 /bin/bash

- name: install rpm in container
run: |
docker exec ubiInstance bash -c "ls -la /output"
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi8.6.x86_64.rpm"
docker exec ubiInstance bash -c "yum -y localinstall /output/apisix-runtime-${BUILD_APISIX_RUNTIME_VERSION}-0.ubi9.6.x86_64.rpm"

- name: check and ensure apisix-runtime is installed
run: |
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Publish Artifact
uses: actions/[email protected]
with:
name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi8.6.x86_64.rpm
name: apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
path: output/apisix-runtime-${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0.ubi9.6.x86_64.rpm
retention-days: 5
if-no-files-found: error
Loading
Loading