Skip to content

Commit f17345e

Browse files
committed
chore(CI)[sc-97669]: fix the CI action
1 parent 25dffa3 commit f17345e

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,15 @@ name: CI
33

44
on:
55
pull_request:
6-
branches: [main]
6+
branches: [WD_1.X_dev]
77
paths-ignore:
88
- '**/*.md'
99
push:
1010
tags:
1111
- v*
1212

1313
env:
14-
QTVERSION: 5.15.0-lts
15-
BUILD_CONFIG: "{
16-
'variables': {
17-
'QT5': '1',
18-
'WD_CONFIG_QWIDGET_BASE': '1',
19-
'WD_CONFIG_WEBKIT': '0',
20-
'WD_CONFIG_QUICK': '1',
21-
'WD_CONFIG_PLAYER': '0',
22-
'WD_CONFIG_ONE_KEYRELEASE': '0',
23-
'QT_INC_PATH': '/opt/qt5/include',
24-
'QT_BIN_PATH': '/opt/qt5/bin',
25-
'QT_LIB_PATH': '/opt/qt5/lib'
26-
},
27-
}"
14+
QTVERSION: 5.15.8-lts-lgpl
2815

2916
jobs:
3017
tar-src:
@@ -76,25 +63,27 @@ jobs:
7663
libicu-dev \
7764
libjpeg-dev \
7865
libpng-dev \
66+
libunwind-dev \
7967
libxslt1-dev \
8068
- name: Install Qt
81-
run: curl -L https://github.com/constructpm/qt-build/releases/download/v5.15.8-lts-lgpl-1/qt-5.15.8-lts-lgpl-cpp17-${{ matrix.config.os }}x64.tar.gz | sudo tar -xJC /opt
69+
run: curl -L https://github.com/constructpm/qt-build/releases/download/v5.15.8-lts-lgpl-1/qt-5.15.8-lts-lgpl-cpp17-${{ matrix.config.os }}-x64.tar.gz | sudo tar -xJC /opt
8270
- name: Install Qtwebkit
8371
run: curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v5.212.0-1/qtwebkit-d1c854e-cpp17-${{ matrix.config.os }}-x64.tar.gz | sudo tar xvJ -C /opt
8472
- name: checkout
8573
uses: actions/checkout@v4
86-
- name: Configure
87-
run: echo ${BUILDCONFIG} > wd.gypi
8874
- name: Build
89-
run: build.sh
75+
working-directory: ${{ github.workspace }}
76+
run: ./build.sh
9077
- name: Archive
91-
working-directory: ${{ github.workspace }}/opt
92-
run: tar cJfv "${{ steps.config.outputs.artefact_name }}" qtwebdriver
78+
working-directory: ${{ github.workspace }}
79+
run: |
80+
mv out qtwebdriver
81+
tar cJfv "${{ steps.config.outputs.artefact_name }}" qtwebdriver
9382
- name: Upload
9483
uses: actions/upload-artifact@v4
9584
with:
9685
name: "${{ steps.config.outputs.artefact_name }}"
97-
path: "${{ github.workspace }}/opt/${{ steps.config.outputs.artefact_name }}"
86+
path: "${{ github.workspace }}/${{ steps.config.outputs.artefact_name }}"
9887

9988
release:
10089
if: contains(github.ref, 'tags/v')

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ report/*
1717
/build/
1818
/docs/
1919
/mocs/
20-
wd.gypi
2120
/wd.Makefile
2221
/Makefile
2322
/WebDriver.target.mk

wd.gypi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
'variables': {
3+
'QT5': '1',
4+
'WD_CONFIG_QWIDGET_BASE': '1',
5+
'WD_CONFIG_WEBKIT': '0',
6+
'WD_CONFIG_QUICK': '1',
7+
'WD_CONFIG_PLAYER': '0',
8+
'WD_CONFIG_ONE_KEYRELEASE': '0',
9+
'QT_INC_PATH': '/opt/qt5/include',
10+
'QT_BIN_PATH': '/opt/qt5/bin',
11+
'QT_LIB_PATH': '/opt/qt5/lib'
12+
},
13+
}

0 commit comments

Comments
 (0)