Skip to content

Commit 7900362

Browse files
committed
chore(gitlab-ci): remove legacy build
1 parent e95a8ac commit 7900362

File tree

3 files changed

+26
-53
lines changed

3 files changed

+26
-53
lines changed

.build.yml

-33
This file was deleted.

.gitlab-ci.yml

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
include:
2-
remote: "https://github.com/git-developer/docker-support/raw/v3.4.1/gitlab-ci/docker-support.yml"
2+
remote: "https://github.com/git-developer/docker-support/raw/main/gitlab-ci/docker-template.yml"
33

44
variables:
5+
IMAGE_TITLE: 'tfrec'
6+
IMAGE_PLATFORMS: 'linux/amd64,linux/i386,linux/arm64/v8,linux/arm/v7,linux/arm/v6'
57
UPDATE_CHECK_URLS: 'https://github.com/baycom/tfrec.git'
68

7-
stages:
8-
- post_checkout
9+
read_application_tags:
10+
extends: .docker_support:.with_bare_image
11+
stage: post_build
12+
artifacts:
13+
paths:
14+
- tags
15+
- labels
16+
script:
17+
- set -euo pipefail
18+
- run() { docker run --rm "${IMAGE_NAME}:${BUILD_CACHE}" sh -c "${@}"; }
919

10-
trigger_on_update:
11-
extends: .docker_support:.trigger_on_update
12-
stage: post_checkout
13-
dependencies: []
20+
- COMMIT_DATE="$(run '[ ! -r /opt/tfrec-metadata/commit_date ] || cut -d " " -f 1 </opt/tfrec-metadata/commit_date')"
21+
- COMMIT_SHORT_SHA="$(run '[ ! -r /opt/tfrec-metadata/commit_short_sha ] || cat /opt/tfrec-metadata/commit_short_sha')"
22+
- BUILD_ID="$(date -u +%Y%m%d_%H%M%S)-${IMAGE_REVISION:-${CI_COMMIT_SHORT_SHA}}-$(od -An -N5 -tu4 </dev/urandom | tr -d ' ' | head -c8)"
1423

15-
run_matrix_build:
16-
extends: .docker_support:.build_job
17-
stage: post_checkout
18-
trigger:
19-
include: .build.yml
20-
forward:
21-
pipeline_variables: true
22-
parallel:
23-
matrix:
24-
- BASE_IMAGE: [ "alpine", "alpine:3.12" ]
25-
BUILD_ARGS: "BASE_IMAGE"
26-
BUILD_CONTEXT: "image"
27-
IMAGE_PLATFORMS: 'linux/amd64,linux/i386,linux/arm64/v8,linux/arm/v7,linux/arm/v6'
24+
- mkdir -p tags
25+
- echo >tags/build_id "${IMAGE_NAME}:b${BUILD_ID}"
26+
- |
27+
if [ "${COMMIT_DATE}" ]; then
28+
APP_VERSION="${COMMIT_DATE}.${COMMIT_SHORT_SHA}"
29+
echo >tags/commit_info "${IMAGE_NAME}:${APP_VERSION}"
30+
mkdir -p labels
31+
echo >labels/org.opencontainers.image.version "org.opencontainers.image.version=${APP_VERSION}"
32+
fi

image/Dockerfile.alpine

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ARG ALPINE_REPO_URL
55
RUN apk add git make g++ pkgconf librtlsdr-dev
66
RUN git clone --depth 1 --single-branch https://github.com/baycom/tfrec /opt/tfrec
77
WORKDIR /opt/tfrec
8+
RUN sed -i '/#include <string>/a #include <cstdint>' decoder.h
89
RUN mkdir -p metadata && \
910
echo >./metadata/commit_sha $(git rev-parse HEAD) && \
1011
echo >./metadata/commit_short_sha $(git rev-parse --short HEAD) && \

0 commit comments

Comments
 (0)