Skip to content

Commit

Permalink
2023-11-12 14:38 UTC+0100 Phil Krylov (phil a t krylov.eu)
Browse files Browse the repository at this point in the history
  * .github/workflows/linux-ci.yml
  * .github/workflows/macos-ci.yml
  * .github/workflows/vm1-ci.yml
  * .github/workflows/windows-ci.yml
    * Made strict CI build not that strict by adding
      -Wno-error=deprecated-declarations.
    ! Fixed ccache configuration under msys2.
  • Loading branch information
tuffnatty committed Nov 12, 2023
1 parent 9e989d3 commit 6f95609
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
esac ;;
esac
tee ./.bashrc <<EOENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
esac ;;
esac
tee ./.bashrc <<EOENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vm1-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=array-bounds" ;;
(gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
esac ;;
esac
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ jobs:
ref: ${{ github.event.client_payload.branch }}

- run: pwd
shell: msys2 {0}

- run: ls
shell: msys2 {0}

- name: Prepare ccache using action
if: matrix.compiler != 'bcc'
Expand All @@ -87,9 +90,9 @@ jobs:
case ${{matrix.strictness}} in
normal) ;;
strict) case ${{matrix.compiler}} in
(mingw64) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=array-bounds" ;;
(mingw64) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
(bcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -w!" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
esac ;;
esac
tee ./.bashrc <<EOENV
Expand All @@ -114,6 +117,15 @@ jobs:
export HB_CCACHE=""
EOMSYSENV
;;
*)
tee -a ./.bashrc <<'EOCCACHE'
# Reconfigure ccache in msys2
ccache --set-config="cache_dir=$(pwd)/.ccache"
ccache --set-config=max_size=32M
ccache --set-config=compression=true
ccache -p
EOCCACHE
;;
esac
Expand Down
9 changes: 9 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */

2023-11-12 14:38 UTC+0100 Phil Krylov (phil a t krylov.eu)
* .github/workflows/linux-ci.yml
* .github/workflows/macos-ci.yml
* .github/workflows/vm1-ci.yml
* .github/workflows/windows-ci.yml
* Made strict CI build not that strict by adding
-Wno-error=deprecated-declarations.
! Fixed ccache configuration under msys2.

2023-11-11 21:41 UTC+0100 Phil Krylov (phil a t krylov.eu)
* contrib/hbwin/win_bmp.c
! Fixed dangling pointer access (introduced in commit 64dba82) in
Expand Down

0 comments on commit 6f95609

Please sign in to comment.