stream.place / streamplace
Live video on the AT Protocol
fork atom

ci: further gitlab ci improvements (#240)

* ci: builder in GCR region

* new branch new typo

* tweak location

* docker auth as a file

* fix bunny build

* ci: handle tiny jobs locally

* ci: oops fix github ci too

authored by

Eli Mallon and committed by
GitHub 7961e88f 28035f85

+30 -11
+1 -1
.github/workflows/build.yaml
··· 23 23 - name: linux-arm64 24 24 cmd: "make app && make linux-arm64" 25 25 - name: windows-amd64 26 - cmd: "make app && make windows-amd64 && make desktop-windows" 26 + cmd: "make app && make windows-amd64 && make desktop-windows-amd64" 27 27 - name: android 28 28 cmd: "make app && make android-release" 29 29 steps:
+29 -10
.gitlab-ci.yml
··· 1 1 include: ".ci/dockerfile-hash.yaml" 2 2 3 + variables: 4 + DOCKER_REPO: "us-central1-docker.pkg.dev/aquareum-tv/streamplace/build" 5 + 3 6 build-bunny: 4 7 stage: build 5 8 interruptible: true ··· 8 11 entrypoint: [""] 9 12 timeout: 2 hours 10 13 script: 14 + - mkdir -p /kaniko/.docker 15 + - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json 11 16 - /kaniko/executor 12 17 --context "${CI_PROJECT_DIR}/docker" 13 18 --dockerfile "${CI_PROJECT_DIR}/docker/bunny.Dockerfile" 14 - --destination "$CI_REGISTRY_IMAGE:bunny" 19 + --destination "$DOCKER_REPO:bunny" 15 20 16 21 builder: 17 22 stage: build ··· 21 26 name: gcr.io/kaniko-project/executor:v1.14.0-debug 22 27 entrypoint: [""] 23 28 variables: 24 - FQ_IMAGE_NAME: "$CI_REGISTRY_IMAGE:builder-$DOCKERFILE_HASH" 29 + FQ_IMAGE_NAME: "$DOCKER_REPO:builder-$DOCKERFILE_HASH" 25 30 timeout: 2 hours 26 31 script: 32 + - mkdir -p /kaniko/.docker 33 + - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json 27 34 - /kaniko/executor 28 35 --build-arg TARGETARCH=amd64 29 36 --build-arg DOCKERFILE_HASH=$DOCKERFILE_HASH ··· 55 62 .build: 56 63 stage: build 57 64 interruptible: true 58 - image: "$CI_REGISTRY_IMAGE:builder-$DOCKERFILE_HASH" 65 + image: "$DOCKER_REPO:builder-$DOCKERFILE_HASH" 59 66 timeout: 2 hours 60 67 script: 61 68 - rm -rf /usr/x86_64-w64-mingw32/include/d3dcompiler.h /usr/share/mingw-w64/include/d3dcompiler.h /usr/lib/gcc/x86_64-w64-mingw32/10-posix/libssp.dll.a /usr/lib/gcc/x86_64-w64-mingw32/10-posix/libssp-0.dll /usr/lib/gcc/x86_64-w64-mingw32/10-win32/libssp-0.dll /usr/lib/gcc/x86_64-w64-mingw32/10-win32/libssp.dll.a ··· 91 98 artifacts: true 92 99 - job: build-bunny 93 100 image: 94 - name: "$CI_REGISTRY_IMAGE:bunny" 101 + name: "$DOCKER_REPO:bunny" 95 102 variables: 96 103 SP_WIDE_OPEN: "true" 97 104 SP_NO_FIREHOSE: "true" ··· 113 120 artifacts: true 114 121 - job: build-bunny 115 122 image: 116 - name: "$CI_REGISTRY_IMAGE:bunny" 123 + name: "$DOCKER_REPO:bunny" 117 124 variables: 118 125 SP_WIDE_OPEN: "true" 119 126 SP_NO_FIREHOSE: "true" ··· 130 137 test: 131 138 stage: build 132 139 interruptible: true 133 - image: "$CI_REGISTRY_IMAGE:builder-$DOCKERFILE_HASH" 140 + image: "$DOCKER_REPO:builder-$DOCKERFILE_HASH" 134 141 timeout: 2 hours 135 142 variables: 136 143 STREAMPLACE_IGNORE_LEAKS: "true" ··· 150 157 entrypoint: [""] 151 158 timeout: 2 hours 152 159 script: 160 + - mkdir -p /kaniko/.docker 161 + - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json 153 162 - /kaniko/executor 154 163 --build-arg TARGETARCH=amd64 155 164 --build-arg STREAMPLACE_URL=$STREAMPLACE_URL_LINUX_AMD64 156 165 --context "${CI_PROJECT_DIR}" 157 166 --dockerfile "${CI_PROJECT_DIR}/docker/mistserver.Dockerfile" 158 - --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_BRANCH-mistserver" 159 - --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-mistserver" 167 + --destination "$DOCKER_REPO:$STREAMPLACE_BRANCH-mistserver" 168 + --destination "$DOCKER_REPO:$STREAMPLACE_VERSION-mistserver" 160 169 161 170 build-docker-amd64: 162 171 stage: build ··· 169 178 entrypoint: [""] 170 179 timeout: 2 hours 171 180 script: 181 + - mkdir -p /kaniko/.docker 182 + - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json 172 183 - /kaniko/executor 173 184 --build-arg TARGETARCH=amd64 174 185 --build-arg STREAMPLACE_URL=$STREAMPLACE_URL_LINUX_AMD64 ··· 176 187 --dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile" 177 188 --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_BRANCH-amd64" 178 189 --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-amd64" 190 + --destination "$DOCKER_REPO:$STREAMPLACE_BRANCH-amd64" 191 + --destination "$DOCKER_REPO:$STREAMPLACE_VERSION-amd64" 179 192 180 193 build-docker-arm64: 181 194 stage: build ··· 191 204 entrypoint: [""] 192 205 timeout: 2 hours 193 206 script: 207 + - mkdir -p /kaniko/.docker 208 + - cp "$DOCKER_AUTH_CONFIG" /kaniko/.docker/config.json 194 209 - /kaniko/executor 195 210 --build-arg TARGETARCH=arm64 196 211 --build-arg STREAMPLACE_URL=$STREAMPLACE_URL_LINUX_ARM64 ··· 198 213 --dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile" 199 214 --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_BRANCH-arm64" 200 215 --destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-arm64" 216 + --destination "$DOCKER_REPO:$STREAMPLACE_BRANCH-arm64" 217 + --destination "$DOCKER_REPO:$STREAMPLACE_VERSION-arm64" 201 218 --customPlatform=linux/arm64 202 219 203 220 build-docker-manifest: ··· 226 243 .build-android: 227 244 stage: build 228 245 interruptible: true 229 - image: "$CI_REGISTRY_IMAGE:builder-$DOCKERFILE_HASH" 246 + image: "$DOCKER_REPO:builder-$DOCKERFILE_HASH" 230 247 timeout: 2 hours 231 248 script: 232 249 - git fetch --unshallow || echo 'already unshallow' ··· 304 321 release: 305 322 stage: build 306 323 interruptible: true 307 - image: "$CI_REGISTRY_IMAGE:builder-$DOCKERFILE_HASH" 324 + image: "$DOCKER_REPO:builder-$DOCKERFILE_HASH" 308 325 needs: 309 326 - build-mac 310 327 - build-android-debug ··· 320 337 - make ci-release 321 338 322 339 .report-status: 340 + tags: 341 + - tiny-job 323 342 interruptible: true 324 343 image: 325 344 name: curlimages/curl