Skip to content

Commit 5b09d63

Browse files
xengine-qytxengine-qyt
committed
ci:delete Centos_build
ci:added opensuse build: ci:adjust fedora build
1 parent d2f94d9 commit 5b09d63

4 files changed

Lines changed: 61 additions & 46 deletions

File tree

‎.github/workflows/fedora_build.yml‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,41 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: fedora:${{ matrix.fedora-version }}
19+
image: fedora:${{ matrix.version }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
2323
include:
2424
- arch: amd64
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
27-
fedora-version: 43
27+
version: 44
2828
artifact: x86-64
2929
- arch: amd64
3030
runner: ubuntu-24.04
3131
platform: linux/amd64
32-
fedora-version: 42
32+
version: 43
3333
artifact: x86-64
3434
- arch: amd64
3535
runner: ubuntu-24.04
3636
platform: linux/amd64
37-
fedora-version: 41
37+
version: 42
3838
artifact: x86-64
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
version: 44
43+
artifact: Arm64
44+
- arch: arm64
45+
runner: ubuntu-24.04-arm
46+
platform: linux/arm64
47+
version: 43
48+
artifact: Arm64
49+
- arch: arm64
50+
runner: ubuntu-24.04-arm
51+
platform: linux/arm64
52+
version: 42
53+
artifact: Arm64
3954

4055
steps:
4156
- name: Checkout main repository code
@@ -58,9 +73,9 @@ jobs:
5873
- name: install xengine library
5974
run: |
6075
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
61-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip
62-
unzip ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip -d ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
63-
cd XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
76+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Fedora_${{ matrix.version }}_${{ matrix.artifact }}.zip
77+
unzip ./XEngine_Fedora_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Fedora_${{ matrix.version }}_${{ matrix.artifact }}
78+
cd XEngine_Fedora_${{ matrix.version }}_${{ matrix.artifact }}
6479
6580
chmod 777 *
6681
./XEngine_LINEnv.sh -i 3
@@ -83,6 +98,6 @@ jobs:
8398
- name: Upload folder as artifact
8499
uses: actions/upload-artifact@v7
85100
with:
86-
name: XEngine_AuthorizeService-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
101+
name: XEngine_AuthorizeService-Fedora_${{ matrix.version }}_${{ matrix.artifact }}
87102
path: XEngine_Release/
88103
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
git submodule init
3030
git submodule update
3131
32-
- name: brew install
33-
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
34-
3532
- name: Set TERM variable
3633
run: echo "TERM=xterm" >> $GITHUB_ENV
3734

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,15 @@ jobs:
7979
skip_unpack: true
8080
if_no_artifact_found: fail
8181
path: ./XRelease/
82+
- name: Download opensuse Linux
83+
uses: dawidd6/action-download-artifact@v24
84+
with:
85+
workflow: suse_build.yml
86+
workflow_conclusion: success
87+
check_artifacts: false
88+
skip_unpack: true
89+
if_no_artifact_found: fail
90+
path: ./XRelease/
8291

8392
- name: Display structure of downloaded files
8493
run: ls -al ./XRelease/

.github/workflows/Centos_build.yml renamed to .github/workflows/suse_build.yml

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: centos build workflows
1+
name: opensuse build workflows
22

33
on:
44
push:
55
branches:
6-
- 'develop1'
6+
- 'develop'
77
paths:
88
- 'XEngine_Source/**'
99
- 'XEngine_Release/**'
@@ -16,78 +16,72 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: quay.io/centos/centos:${{ matrix.stream }}
20-
options: --platform ${{ matrix.platform }}
19+
image: opensuse/leap:${{ matrix.version }}
20+
options: --platform=${{ matrix.platform }}
2121
strategy:
2222
matrix:
2323
include:
2424
- arch: amd64
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
27+
version: 16.0
2728
artifact: x86-64
28-
version: 9
29-
stream: stream9
30-
- arch: amd64
31-
runner: ubuntu-24.04
32-
platform: linux/amd64
33-
artifact: x86-64
34-
version: 10
35-
stream: stream10
3629
- arch: arm64
3730
runner: ubuntu-24.04-arm
3831
platform: linux/arm64
32+
version: 16.0
3933
artifact: Arm64
40-
version: 9
41-
stream: stream9
42-
- arch: arm64
43-
runner: ubuntu-24.04-arm
44-
platform: linux/arm64
45-
artifact: Arm64
46-
version: 10
47-
stream: stream10
4834

4935
steps:
5036
- name: Checkout main repository code
5137
uses: actions/checkout@v7
38+
with:
39+
ref: 'develop'
5240

5341
- name: sub module checkout (opensource)
5442
uses: actions/checkout@v7
5543
with:
5644
repository: libxengine/XEngine_OPenSource
5745
path: XEngine_Source/XEngine_DependLibrary
5846

59-
- name: Set TERM variable
60-
run: echo "TERM=xterm" >> $GITHUB_ENV
61-
6247
- name: install system package
6348
run: |
64-
dnf update -y
65-
dnf install gcc g++ make git jq unzip wget -y
49+
zypper --non-interactive update -y
50+
zypper install -y gcc gcc-c++ make git jq unzip wget
51+
52+
- name: Set TERM variable
53+
run: echo "TERM=xterm" >> $GITHUB_ENV
6654

6755
- name: install xengine library
56+
env:
57+
GH_TOKEN: ${{ github.token }}
6858
run: |
69-
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
70-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
71-
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
72-
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
59+
latest_tag=$(curl -s -H "Authorization: Bearer ${{ github.token }}" https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
60+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_OpenSuse_${{ matrix.version }}_${{ matrix.artifact }}.zip
61+
unzip ./XEngine_OpenSuse_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_OpenSuse_${{ matrix.version }}_${{ matrix.artifact }}
62+
cd XEngine_OpenSuse_${{ matrix.version }}_${{ matrix.artifact }}
7363
7464
chmod 777 *
7565
./XEngine_LINEnv.sh -i 3
76-
7766
- name: make
78-
run: |
67+
run: |
7968
cd XEngine_Source
69+
make
70+
make FLAGS=InstallAll
71+
make FLAGS=CleanAll
72+
8073
make RELEASE=1
8174
make FLAGS=InstallAll
8275
make FLAGS=CleanAll
83-
cd ..
76+
8477
- name: test
8578
run: |
8679
cd XEngine_Release
8780
./XEngine_AuthorizeService -t
8881
89-
- name: Upload folder as artifact
82+
- name: Upload folder as artifact with OPensuse
9083
uses: actions/upload-artifact@v7
9184
with:
92-
name: XEngine_AuthorizeService-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
93-
path: XEngine_Release/
85+
name: XEngine_AuthorizeService-OPensuse_${{ matrix.version }}_${{ matrix.artifact }}
86+
path: XEngine_Release/
87+
retention-days: 1

0 commit comments

Comments
 (0)