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
23 changes: 11 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env:

jobs:
osx:
runs-on: macos-13
runs-on: macos-14
defaults:
run:
shell: bash
Expand All @@ -55,7 +55,7 @@ jobs:
run: echo "KTOOLS_BRANCH=${{ inputs.ktools_branch }}" >> $GITHUB_ENV

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: OasisLMF/ktools
ref: ${{ env.KTOOLS_BRANCH }}
Expand All @@ -69,12 +69,11 @@ jobs:
libtool \
zlib-ng

- name: (MacOS) Build ktools x86
- name: (MacOS) Build ktools arm64
run: |
BIN_TARGET=$(pwd)/x86
BIN_TARGET=$(pwd)/arm64
./autogen.sh
./configure --enable-osx --enable-o3 --prefix=$BIN_TARGET
make check
make install

- name: Store ktest output
Expand All @@ -87,14 +86,14 @@ jobs:

- name: Tarball bin files
run: |
cd ./x86/bin
tar -zcvf ${{ github.workspace }}/Darwin_x86_64.tar.gz ./
cd ./arm64/bin
tar -zcvf ${{ github.workspace }}/Darwin_arm64.tar.gz ./

- name: 'Upload Ktool binaries - x86'
- name: 'Upload Ktool binaries - arm64'
uses: actions/upload-artifact@v4
with:
name: Darwin_x86_64
path: Darwin_x86_64.tar.gz
name: Darwin_arm64
path: Darwin_arm64.tar.gz
retention-days: 5

linux:
Expand All @@ -115,13 +114,13 @@ jobs:
run: echo "SKIP_CMAKE=true" >> $GITHUB_ENV

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: OasisLMF/ktools
ref: ${{ env.KTOOLS_BRANCH }}

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Download Darwin binaies
uses: actions/download-artifact@v4
with:
name: Darwin_x86_64
name: Darwin_arm64
path: ${{ github.workspace }}/

- name: Extract linux build
Expand Down Expand Up @@ -257,8 +257,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.BUILD_GIT_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ github.workspace }}/Darwin_x86_64.tar.gz
asset_name: Darwin_x86_64.tar.gz
asset_path: ${{ github.workspace }}/Darwin_arm64.tar.gz
asset_name: Darwin_arm64.tar.gz
asset_content_type: application/octet-stream

- name: slack message vars
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Ktools Changelog
================

.. _`v3.12.5`: https://github.com/OasisLMF/ktools/compare/v3.12.4...v3.12.5

`v3.12.4`_
---------
* [#386](https://github.com/OasisLMF/ktools/pull/386) - Release 3.12.3
Expand Down
2 changes: 1 addition & 1 deletion VERSION.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.12.4
3.12.5
Loading