Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 0 additions & 16 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: check-macos
on:
push:
branches: [ "macos" ]
tags: [ "*" ]
pull_request:
branches: [ "master" ]

Expand All @@ -27,19 +26,4 @@ jobs:
export PKG_CONFIG_PATH="$(brew --prefix curl)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig"
meson setup --prefix=$(brew --prefix)/Cellar/lib3270/${{ steps.gettag.outputs.tag }} .build
meson compile -C .build
- name: package
run: |
DESTDIR=${PWD}/.bin/package meson install -C .build
tar --create --verbose --xz --file=macos-lib3270.tar.xz --directory=${PWD}/.bin/package/$(brew --prefix)/Cellar --verbose .
- name: upload
uses: ncipollo/release-action@v1
with:
tag: ${{ steps.gettag.outputs.tag }}
artifacts: "macos-lib3270.tar.xz"
allowUpdates: true
draft: false
makeLatest: true
omitBody: true
omitPrereleaseDuringUpdate: true
replacesArtifacts: true

4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ subdir('po')
#

c = meson.get_compiler('c')
libssl = dependency('libssl', required: false)
libssl = dependency('OpenSSL', required: false)
libintl = dependency('intl', required : false)
libiconv = dependency('iconv', required : false)

lib_extra = [
dependency('threads'),
libintl,
libiconv
]
Expand Down Expand Up @@ -84,7 +85,6 @@ cc = meson.get_compiler('c')

compiler_flags = [
'-ggdb3',
'-pthread',
'-DHAVE_CONFIG_H=1',
'-DBUILD_DATE='+time_epoch,
]
Expand Down
Loading