Skip to content

Commit

Permalink
DRTVWR-578: promote actions branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-goodspeed authored Oct 25, 2023
2 parents f149ccd + 650fb94 commit 099d10a
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 17 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:

- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
18 changes: 18 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
labels:
- ignore-for-release
authors:
- dependabot
categories:
- title: Breaking Changes 🛠
labels:
- semver-major
- breaking-change
- title: New Features 🎉
labels:
- semver-minor
- enhancement
- title: Other Changes
labels:
- '*'
24 changes: 24 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Build
on: [push]
jobs:
build:
strategy:
matrix:
os: [windows-2022, macos-11, ubuntu-22.04]
addrsize: ["64"]
include:
- os: windows-2022
addrsize: "32"
continue-on-error: false
runs-on: ${{ matrix.os }}
steps:
- uses: secondlife/action-autobuild@v3
with:
addrsize: ${{ matrix.addrsize }}

release:
needs: build
runs-on: [ubuntu-latest]
if: startsWith(github.ref, 'refs/tags/v')
steps:
- uses: secondlife/action-autobuild-release@v2
File renamed without changes.
9 changes: 0 additions & 9 deletions BuildParams

This file was deleted.

5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# 3p-libhunspell

[Hunspell][] autobuild package

[Hunspell]: http://hunspell.github.io/
26 changes: 19 additions & 7 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,19 @@ fi

stage="$(pwd)/stage"

# IMPORTANT: (Effectively) removing the code signing step for macOS
# builds with this declaration during the move to GHA. It will
# need to be added back in once we have a strategy for doing so.
build_secrets_checkout=""

# load autobuild provided shell functions and variables
source_environment_tempfile="$stage/source_environment.sh"
"$autobuild" source_environment > "$source_environment_tempfile"
. "$source_environment_tempfile"

# remove_cxxstd
source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions"

build=${AUTOBUILD_BUILD_ID:=0}
echo "${HUNSPELL_VERSION}.${build}" > "${stage}/VERSION.txt"

Expand All @@ -45,7 +53,10 @@ pushd "$HUNSPELL_SOURCE_DIR"
windows*)
load_vsvars

build_sln "src/win_api/hunspell.sln" "Release_dll|$AUTOBUILD_WIN_VSPLATFORM"
msbuild.exe "$(cygpath -w src/win_api/hunspell.sln)" \
-p:Platform=$AUTOBUILD_WIN_VSPLATFORM \
-p:Configuration="Release_dll" \
-p:PlatformToolset=v143

mkdir -p "$stage/lib/release"

Expand All @@ -58,14 +69,15 @@ pushd "$HUNSPELL_SOURCE_DIR"
;;
darwin*)
opts="-m$AUTOBUILD_ADDRSIZE -arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE"
export CFLAGS="$opts"
plainopts="$(remove_cxxstd $opts)"
export CFLAGS="$plainopts"
export CXXFLAGS="$opts"
export LDFLAGS="$opts"
export LDFLAGS="$plainopts"
./configure --prefix="$stage"
make
make -j$(nproc)
make install
mkdir -p "$stage/lib/release"
mv "$stage/lib/"{*.a,*.dylib,*.alias} "$stage/lib/release"
mv "$stage/lib/"{*.a,*.dylib} "$stage/lib/release"
pushd "$stage/lib/release"
fix_dylib_id libhunspell-*.dylib

Expand All @@ -85,8 +97,8 @@ pushd "$HUNSPELL_SOURCE_DIR"
;;
linux*)
opts="-m$AUTOBUILD_ADDRSIZE $LL_BUILD_RELEASE"
CFLAGS="$opts" CXXFLAGS="$opts" ./configure --prefix="$stage"
make
CFLAGS="$(remove_cxxstd $opts)" CXXFLAGS="$opts" ./configure --prefix="$stage"
make -j$(nproc)
make install
mv "$stage/lib" "$stage/release"
mkdir -p "$stage/lib"
Expand Down
2 changes: 1 addition & 1 deletion hunspell/src/tools/hunspell.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define HUNSPELL_VERSION VERSION
#define INPUTLEN 50

#define HUNSPELL_PIPE_HEADING "@(#) International Ispell Version 3.2.06 (but really Hunspell "VERSION")\n"
#define HUNSPELL_PIPE_HEADING "@(#) International Ispell Version 3.2.06 (but really Hunspell " VERSION ")\n"
#define HUNSPELL_HEADING "Hunspell "

//for debugging only
Expand Down

0 comments on commit 099d10a

Please sign in to comment.