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 506f6a5 commit 715163d
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 34 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 @@ -31,11 +31,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( foundation-developer NONE)
project( foundation-developer VERSION 0.24.0 LANGUAGES NONE)

set( PROJECT_VERSION 0.23.0)
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 with mulle-sde and the mulle-objc Foundation")
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
&& git clone https://github.com/clibs/clib.git /tmp/clib \
&& ( cd /tmp/clib ; make ; make install ) \
\
&& wget "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.0/mulle-clang-17.0.6.0-bookworm-amd64.deb" \
&& dpkg --install "mulle-clang-17.0.6.0-bookworm-amd64.deb"
&& wget "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.2/mulle-clang-17.0.6.2-bookworm-amd64.deb" \
&& dpkg --install "mulle-clang-17.0.6.2-bookworm-amd64.deb"

2 changes: 1 addition & 1 deletion bin/apt-installer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh -x

MULLE_CLANG_VERSION="${MULLE_CLANG_VERSION:-17.0.6.0}"
MULLE_CLANG_VERSION="${MULLE_CLANG_VERSION:-17.0.6.2}"

if [ ! -w /etc/apt/sources.list.d ]
then
Expand Down
6 changes: 3 additions & 3 deletions cola/install.md.bud
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ the [compiler releases](//github.com/mulle-cc/mulle-clang-project/releases)
page:

``` sh
curl -L -O "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.0/mulle-clang-17.0.6.0-bookworm-amd64.deb"
sudo dpkg --install "mulle-clang-17.0.6.0-bookworm-amd64.deb"
curl -L -O "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.2/mulle-clang-17.0.6.2-bookworm-amd64.deb"
sudo dpkg --install "mulle-clang-17.0.6.2-bookworm-amd64.deb"
```

Check the [debugger releases](//github.com/mulle-cc/mulle-gdb/releases)
Expand Down Expand Up @@ -143,7 +143,7 @@ sudo apt-get install foundation-developer
#### Install mulle-clang and mulle-gdb

``` sh
curl -L -O "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.0/mulle-clang-17.0.6.0-bullseye-amd64.deb"
curl -L -O "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.2/mulle-clang-17.0.6.0-bullseye-amd64.deb"
sudo dpkg --install "mulle-clang-17.0.6.0-bullseye-amd64.deb"
```

Expand Down
15 changes: 0 additions & 15 deletions src/foundation/apple-clang/share/craft/definition.darwin/README.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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 @@ -51,7 +51,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 @@ -61,7 +61,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 @@ -34,7 +34,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/foundation/github-actions/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.22.0
0.24.0

0 comments on commit 715163d

Please sign in to comment.