From 69bcc10064840d4c55d96026a419f0a3975f9d85 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 23 Jun 2025 13:58:10 +0200 Subject: [PATCH 1/5] Update .ci submodule to latest upstream --- .ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci b/.ci index ad8dd4a..b2b4e77 160000 --- a/.ci +++ b/.ci @@ -1 +1 @@ -Subproject commit ad8dd4a136348c7dc889fdc03a645e0f0358a2dc +Subproject commit b2b4e777f71f514e18367568b4a84b66b1233daa From 8103a3892e3b492c8b0bc0154ede0c07ce85939d Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Wed, 4 Jun 2025 10:57:58 +0200 Subject: [PATCH 2/5] ci: Update to ubuntu 22.04. --- .github/workflows/ci-scripts-build.yml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index b68745a..9b53fbb 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -39,68 +39,68 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default base: "7.0" wine: "64" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: static base: "7.0" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default base: "3.15" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default base: "3.14" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: static base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: clang configuration: default base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default base: "7.0" rtems: "4.10" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default base: "7.0" rtems: "4.9" - - os: ubuntu-20.04 - cmp: gcc-8 - utoolchain: "8" + - os: ubuntu-22.04 + cmp: gcc-9 + utoolchain: "9" configuration: default base: "7.0" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: clang configuration: default base: "7.0" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Cache Dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }} From 743dd6194731b242cdb87c0e31f1ffbf93049d1a Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 23 Jun 2025 14:19:22 +0200 Subject: [PATCH 3/5] ci: remove RTEMS "4.10" as it requires further debugging --- .github/workflows/ci-scripts-build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 9b53fbb..7c85923 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -72,11 +72,12 @@ jobs: base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" - - os: ubuntu-22.04 - cmp: gcc - configuration: default - base: "7.0" - rtems: "4.10" + # It requires more debugging: + # - os: ubuntu-22.04 + # cmp: gcc + # configuration: default + # base: "7.0" + # rtems: "4.10" - os: ubuntu-22.04 cmp: gcc From f97e45108b59dc2bd600e1dab947caab21b53cd3 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Thu, 26 Jun 2025 08:40:23 +0200 Subject: [PATCH 4/5] ci: ubuntu-22.04 to ubuntu-latest --- .github/workflows/ci-scripts-build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 7c85923..21941fa 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -39,59 +39,59 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: default base: "7.0" wine: "64" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: static base: "7.0" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: default base: "3.15" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: default base: "3.14" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: static base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: clang configuration: default base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" # It requires more debugging: - # - os: ubuntu-22.04 + # - os: ubuntu-latest # cmp: gcc # configuration: default # base: "7.0" # rtems: "4.10" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc configuration: default base: "7.0" rtems: "4.9" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: gcc-9 utoolchain: "9" configuration: default base: "7.0" - - os: ubuntu-22.04 + - os: ubuntu-latest cmp: clang configuration: default base: "7.0" From 2a3e82a06c9142a17df4fc6651fcb427aff6bc3f Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Thu, 26 Jun 2025 09:04:16 +0200 Subject: [PATCH 5/5] fix: libreadline-dev added. --- .github/workflows/ci-scripts-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 21941fa..081ed56 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -110,7 +110,7 @@ jobs: - name: "apt-get install" run: | sudo apt-get update - sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb + sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb libreadline-dev if: runner.os == 'Linux' - name: "apt-get install ${{ matrix.cmp }}" run: |