Skip to content

Commit

Permalink
update build system
Browse files Browse the repository at this point in the history
* change from release branch to master
  • Loading branch information
mulle-nat committed Nov 19, 2024
1 parent 8006b11 commit 25d7752
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerfile-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ ! env.ACT }}

- name: Build Docker image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mulle-sde-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- name: Dump Environment
run: env | sort

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: mulle-sde/github-ci@v1

- uses: mulle-cc/github-ci@v4
- uses: mulle-cc/github-ci@v5

- name: List extensions
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required( VERSION 3.15)

project( mulle-foundation-developer NONE)
project( mulle-foundation-developer VERSION 0.24.0 LANGUAGES NONE)

set( PROJECT_VERSION 0.23.1)
set( PROJECT_VERSION 0.24.0)


set( EXTENSIONS
Expand Down
4 changes: 2 additions & 2 deletions CMakePackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
set( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
set( CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
set( CPACK_PACKAGE_CONTACT "[email protected]")
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "👑 Objective-C development with the MulleFoundation and mulle-sde")
set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set( CPACK_STRIP_FILES false)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Add to path
run: echo "$HOME/bin" >> $GITHUB_PATH

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: mulle-sde/github-ci@v1

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download Linux Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
with:
name: artifact.Linux
# actual file will be ${{ steps.executable.outputs.exepath }} though!
Expand All @@ -60,7 +60,7 @@ jobs:
mv ${{ github.workspace }}/${{ github.event.repository.name }} ${{ github.workspace }}/${{ github.event.repository.name }}.linux
- name: Download macOS Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
with:
name: artifact.macOS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- release
- master
pull_request:
workflow_dispatch:

Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Dump Environment
run: env | sort

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: mulle-sde/github-ci@v1

Expand Down
2 changes: 1 addition & 1 deletion src/mulle-foundation/github-actions/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.23.0
0.24.0
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
* Get C includes first, if any. As include-private.h is a generic name,
* testing could pick up the wrong one, so we test for inferior header
* that we assume to be there if "include-private.h" were to exist.
*
* #ifdef __has_include
* # if __has_include( "_<|PROJECT_NAME|>-include-private.h")
* # include "include-private.h"
* # endif
* #endif
*/
#ifdef __has_include
# if __has_include( "_<|PROJECT_NAME|>-include-private.h")
# include "include-private.h"
# endif
#endif

#import "import.h"

Expand Down
2 changes: 1 addition & 1 deletion src/mulle-foundation/objc/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.23.0
0.24.0

0 comments on commit 25d7752

Please sign in to comment.