Skip to content
Closed
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
10 changes: 5 additions & 5 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
fail-fast: false
matrix:
include:
- {os: ubuntu-22.04, arch: X64, packages: build-essential autoconf curl git cmake appstream libtool libxkbcommon-dev libudev-dev yasm libva-dev libpulse-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libgl1-mesa-dev libxkbcommon-x11-dev}
- {os: ubuntu-22.04-arm, arch: ARM64, packages: build-essential autoconf curl git cmake appstream libtool libxkbcommon-dev libudev-dev yasm libva-dev libpulse-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libgl1-mesa-dev libxkbcommon-x11-dev}
- {os: ubuntu-22.04, arch: X64, packages: build-essential autoconf curl git cmake pkg-config appstream libtool libxkbcommon-dev libudev-dev yasm libva-dev libpulse-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libgl1-mesa-dev libxkbcommon-x11-dev}
- {os: ubuntu-22.04-arm, arch: ARM64, packages: build-essential autoconf curl git cmake pkg-config appstream libtool libxkbcommon-dev libudev-dev yasm libva-dev libpulse-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libgl1-mesa-dev libxkbcommon-x11-dev}

steps:
- uses: actions/checkout@v5
Expand Down Expand Up @@ -211,11 +211,11 @@ jobs:
path: /home/runner/work/JS8Call-improved/JS8Call-improved/local/ffmpeg

## hamlib
- name: Install Hamlib 4.6.5
if: steps.cache-hamlib.outputs.cache-hit != 'true'
- name: Install Hamlib 4.7.0 TEST
# if: steps.cache-hamlib.outputs.cache-hit != 'true'
id: install-hamlib
run: |
git clone --depth=1 --branch=4.6.5 https://github.com/Hamlib/Hamlib.git /tmp/hamlib
git clone --depth=1 --branch=4.7.0 https://github.com/Hamlib/Hamlib.git /tmp/hamlib
cd /tmp/hamlib
./bootstrap
./configure --prefix=${GITHUB_WORKSPACE}/local/hamlib
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ jobs:
uses: robinraju/release-downloader@v1.12
with:
repository: 'hamlib/hamlib'
fileName: 'hamlib-w64-4.6.5.zip'
tag: '4.6.5'
fileName: 'hamlib-w64-4.7.0.zip'
tag: '4.7.0'
extract: true
out-file-path: 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib465-tmp'
out-file-path: 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib470-tmp'

- name: Move hamlib directory to the right spot
shell: msys2 {0}
run: |
mv 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib465-tmp/hamlib-w64-4.6.5' 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib'
mv 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib470-tmp/hamlib-w64-4.7.0' 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib'
mv 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib/lib/gcc/libhamlib.dll.a' 'D:/a/JS8Call-improved/JS8Call-improved/local/hamlib/lib/libhamlib.dll.a'

- name: Configure JS8Call
Expand Down
Loading