maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: switch from prplos-next branch to prplos branch

Browse Source 
We've moved development from prplos-next into prplos.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2023-09-29 16:13:10 +00:00 committed by Petr Štetiar
parent 163ba81c17
commit d264d96f7d
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,5 +1,5 @@
variables:
CI_DESIGNATED_BRANCH: prplos-next
CI_DESIGNATED_BRANCH: prplos
include:
- local: .gitlab/build.yml

3
.gitlab/docker/sdk/Dockerfile
View File

@ -1,4 +1,4 @@
ARG DESIGNATED_BRANCH=prplos-next
ARG DESIGNATED_BRANCH=prplos
FROM registry.gitlab.com/prpl-foundation/prplos/prplos/$DESIGNATED_BRANCH/builder:latest
COPY --chown=builder:builder . /home/builder/
@ -6,4 +6,3 @@ COPY --chown=builder:builder . /home/builder/
WORKDIR /home/builder
RUN mkdir .ssh && ssh-keyscan gitlab.com > .ssh/known_hosts
RUN sed -i 's;\(http[s]\?\)://\(.*@\);\1://;g' feeds.conf.default
RUN sed -i 's/prplos.git/prplos.git;prplos-next/' feeds.conf.default

31
.gitlab/sdk.yml
View File

@ -1,5 +1,5 @@
variables:
CI_DESIGNATED_BRANCH: prplos-next
CI_DESIGNATED_BRANCH: prplos
stages:
- generate
@ -23,7 +23,7 @@ stages:
- cd $CI_SDK_TOPDIR
- mkdir logs
- sed -i 's;https://git.openwrt.org;https://gitlab.com/openwrt;' feeds.conf.default
- sed -i -E 's;git.openwrt.org/(feed|project);github.com/openwrt;' feeds.conf.default
- echo "src-include defaults feeds.conf.default" > feeds.conf
- echo "src-link ci $CI_PROJECT_DIR" >> feeds.conf
@ -155,37 +155,46 @@ stages:
.build feed with OpenWrt SDK:
extends: .build feed with SDK
variables:
CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python3-yaml
CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python-yaml python3-yaml
CI_SDK_TOPDIR: /home/build/openwrt
.build feed with intel_mips-xrx500 SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-intel_mips-xrx500:latest
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-intel_mips-xrx500:latest
CI_SDK_INSTALL_FEEDS: base packages luci routing feed_intel
.build feed with ipq40xx-generic SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-ipq40xx-generic:latest
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-ipq40xx-generic:latest
.build feed with mvebu-cortexa9 SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-mvebu-cortexa9:latest
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-mvebu-cortexa9:latest
.build feed with x86-64 SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-x86-64:latest
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-x86-64:latest
.build feed with ath79-generic-19.07.7 SDK:
extends: .build feed with OpenWrt SDK
variables:
CI_SDK_IMAGE: openwrtorg/sdk:ath79-generic-19.07.7
.build feed with x86-64-22.03.2 SDK:
extends: .build feed with OpenWrt SDK
.build feed with x86-64-prplos-next SDK:
extends: .build feed with SDK
variables:
CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python3-yaml
CI_SDK_IMAGE: openwrt/sdk:x86-64-22.03.2
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-x86-64:latest
.build feed with ipq807x-generic-prplos-next SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-ipq807x-generic:latest
.build feed with mvebu-cortexa9-prplos-next SDK:
extends: .build feed with SDK
variables:
CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-mvebu-cortexa9:latest