Skip to content

Commit 5d5ddc0

Browse files
committed
Remove docker image openocd-build-rpm-prerequisites, use fedora:37 instead and install dependencies locally
1 parent 40c810b commit 5d5ddc0

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@ jobs:
102102
needs: init
103103
runs-on: ubuntu-22.04
104104
container:
105-
# To update: (cd docker-openocd-build-rpm-prerequisites/ && \
106-
# docker build -t ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07 && \
107-
# docker push ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07)
108-
image: ghcr.io/rleh/openocd-build-rpm-prerequisites:fedora37_2022-03-07
105+
image: fedora:37
109106
steps:
107+
- name: Update Fedora and install dependencies
108+
run: |
109+
dnf update -y
110+
dnf install -y make libtool pkg-config autoconf automake texinfo tree libusbx-devel hidapi-devel libftdi-devel rpm git which zip rpm-build capstone-devel chrpath jimtcl-devel libjaylink-devel libgpiod-devel sdcc
110111
- name: Build Version
111112
run: |
112113
echo "BUILD_VERSION=${{ needs.init.outputs.build_version }}" >> $GITHUB_ENV

docker-openocd-build-rpm-prerequisites/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)