Skip to content

Commit 55611b0

Browse files
committed
Merge branch 'master' of github.com:tsukumijima/libmali-rockchip
2 parents 84c70a5 + b9619b9 commit 55611b0

File tree

2 files changed

+35
-28
lines changed

2 files changed

+35
-28
lines changed

.github/workflows/Dockerfile

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
ARG IMAGE
22
FROM ${IMAGE}
3+
34
ENV DEBIAN_FRONTEND=noninteractive
5+
46
RUN apt-get update && apt-get install -y software-properties-common && \
57
add-apt-repository -y ppa:ubuntu-support-team/meson
8+
69
RUN apt-get update && apt-get install -y --no-install-recommends \
7-
build-essential \
8-
debhelper \
9-
devscripts \
10-
meson \
11-
pkg-config \
12-
libstdc++6 \
13-
libgbm-dev \
14-
libdrm-dev \
15-
libx11-6 \
16-
libx11-dev \
17-
libx11-xcb1 \
18-
libx11-xcb-dev \
19-
libxcb-dri2-0 \
20-
libxcb-dri2-0-dev \
21-
libxdamage1 \
22-
libxdamage-dev \
23-
libxext6 \
24-
libxext-dev \
25-
libxfixes3 \
26-
libxfixes-dev \
27-
libwayland-client0 \
28-
libwayland-dev && \
29-
rm -rf /var/lib/apt/lists/*
10+
build-essential \
11+
debhelper \
12+
devscripts \
13+
meson \
14+
pkg-config \
15+
libstdc++6 \
16+
libgbm-dev \
17+
libdrm-dev \
18+
libx11-6 \
19+
libx11-dev \
20+
libx11-xcb1 \
21+
libx11-xcb-dev \
22+
libxcb-dri2-0 \
23+
libxcb-dri2-0-dev \
24+
libxdamage1 \
25+
libxdamage-dev \
26+
libxext6 \
27+
libxext-dev \
28+
libxfixes3 \
29+
libxfixes-dev \
30+
libwayland-client0 \
31+
libwayland-dev \
32+
&& apt-get clean autoclean --yes \
33+
&& apt-get autoremove --yes \
34+
&& rm -rf /var/cache/apt/archives* /var/lib/apt/lists/*
35+
3036
COPY . /src/
37+
3138
WORKDIR /src/

.github/workflows/build_and_release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
steps:
2121

2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Set up QEMU
26-
uses: docker/setup-qemu-action@v2
26+
uses: docker/setup-qemu-action@v3
2727
with:
2828
platforms: linux/arm64
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v2
31+
uses: docker/setup-buildx-action@v3
3232

3333
- name: Cache Docker layers
34-
uses: docker/build-push-action@v3
34+
uses: docker/build-push-action@v5
3535
with:
3636
context: .github/workflows/
3737
tags: ${{ matrix.image }}:build
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: Get commit hash
5353
id: get_commit_hash
54-
uses: pr-mpt/actions-commit-hash@v2
54+
uses: prompt/actions-commit-hash@v3
5555

5656
- name: Release
5757
uses: softprops/action-gh-release@v1

0 commit comments

Comments
 (0)