Commit 34fa72f2e9905e48b8da9a678cc95298d0e60697
1 parent
cce0e562
Exists in
develop
Fixing mingw action.
Showing
2 changed files
with
26 additions
and
24 deletions
Show diff stats
.github/workflows/msys2.yml
... | ... | @@ -3,23 +3,41 @@ on: |
3 | 3 | pull_request: |
4 | 4 | branches: |
5 | 5 | - master |
6 | - schedule: | |
7 | - - cron: '30 13 3 2,4,6,8,10,12 *' | |
6 | + push: | |
7 | + branches: | |
8 | + - develop | |
8 | 9 | |
9 | 10 | jobs: |
10 | 11 | msys2-mingw: |
12 | + name: Publish Windows 64 | |
11 | 13 | runs-on: windows-latest |
12 | 14 | defaults: |
13 | 15 | run: |
14 | 16 | shell: msys2 {0} |
15 | 17 | steps: |
16 | 18 | - uses: actions/checkout@v3 |
19 | + - uses: oprypin/find-latest-tag@v1 | |
20 | + id: gettag | |
21 | + with: | |
22 | + repository: PerryWerneck/libv3270 | |
23 | + releases-only: true | |
17 | 24 | - uses: msys2/setup-msys2@v2 |
18 | 25 | with: |
19 | 26 | msystem: mingw64 |
20 | 27 | update: true |
21 | 28 | install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape |
29 | + - uses: robinraju/release-downloader@v1.7 | |
30 | + with: | |
31 | + repository: "PerryWerneck/lib3270" | |
32 | + latest: true | |
33 | + fileName: "mingw-lib3270.x86_64.tar.xz" | |
34 | + - uses: robinraju/release-downloader@v1.7 | |
35 | + with: | |
36 | + repository: "PerryWerneck/libv3270" | |
37 | + latest: true | |
38 | + fileName: "mingw-libv3270.x86_64.tar.xz" | |
22 | 39 | - name: CI-Build |
23 | 40 | run: | |
24 | 41 | ./win/ci-build.sh |
25 | 42 | |
43 | + | ... | ... |
win/ci-build.sh
... | ... | @@ -23,32 +23,16 @@ cd ${myDIR} |
23 | 23 | rm -fr ${myDIR}/.build |
24 | 24 | |
25 | 25 | # |
26 | -# Build LIB3270 | |
26 | +# Unpack lib3270 | |
27 | 27 | # |
28 | -echo "Building lib3270" | |
29 | -mkdir -p ${myDIR}/.build/lib3270 | |
30 | -git clone https://github.com/PerryWerneck/lib3270.git ${myDIR}/.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure" | |
31 | -pushd ${myDIR}/.build/lib3270 | |
32 | -./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" | |
33 | -./configure > $LOGFILE 2>&1 || die "Configure failure" | |
34 | -make clean > $LOGFILE 2>&1 || die "Make clean failure" | |
35 | -make all > $LOGFILE 2>&1 || die "Make failure" | |
36 | -make install > $LOGFILE 2>&1 || die "Install failure" | |
37 | -popd | |
28 | +echo "Unpacking lib3270" | |
29 | +tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "lib3270 unpack failure" | |
38 | 30 | |
39 | 31 | # |
40 | -# Build LIBV3270 | |
32 | +# Unpack libv3270 | |
41 | 33 | # |
42 | -echo "Building libv3270" | |
43 | -mkdir -p ${myDIR}/.build/libv3270 | |
44 | -git clone https://github.com/PerryWerneck/libv3270.git ${myDIR}/.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure" | |
45 | -pushd ${myDIR}/.build/libv3270 | |
46 | -./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" | |
47 | -./configure > $LOGFILE 2>&1 || die "Configure failure" | |
48 | -make clean > $LOGFILE 2>&1 || die "Make clean failure" | |
49 | -make all > $LOGFILE 2>&1 || die "Make failure" | |
50 | -make install > $LOGFILE 2>&1 || die "Install failure" | |
51 | -popd | |
34 | +echo "Unpacking lib3270" | |
35 | +tar -C / -Jxf mingw-libv3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "libv3270 unpack failure" | |
52 | 36 | |
53 | 37 | # |
54 | 38 | # Build PW3270 | ... | ... |