Skip to content
Snippets Groups Projects
Commit 6c8d0dec authored by Frederic Danis's avatar Frederic Danis
Browse files

Drop calls to apt


New flatdeb-builder docker image already embed packages request to build
and upload the Flatpak runtime and apps.

Signed-off-by: default avatarFrédéric Danis <frederic.danis@collabora.com>
parent e78db475
No related branches found
No related tags found
1 merge request!6Update to v2021pre, new apertis-flatdeb-builder and fix upload process
...@@ -19,6 +19,8 @@ stages: ...@@ -19,6 +19,8 @@ stages:
.build: .build:
variables: variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
before_script:
- chmod 0400 "$ARCHIVE_SECRET_FILE"
rules: rules:
- if: $CI_MERGE_REQUEST_ID - if: $CI_MERGE_REQUEST_ID
when: never when: never
...@@ -30,9 +32,6 @@ build-base: ...@@ -30,9 +32,6 @@ build-base:
extends: extends:
- .build - .build
stage: build base stage: build base
before_script:
- apt update
- apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
script: script:
- /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 base - /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 base
artifacts: artifacts:
...@@ -43,10 +42,6 @@ build-platform-runtime: ...@@ -43,10 +42,6 @@ build-platform-runtime:
extends: extends:
- .build - .build
stage: build runtime stage: build runtime
before_script:
- apt update
- apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
- chmod 0400 "$ARCHIVE_SECRET_FILE"
script: script:
- /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 --platform runtimes runtimes/org.apertis.demo.yaml - /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 --platform runtimes runtimes/org.apertis.demo.yaml
- | - |
...@@ -66,10 +61,6 @@ build-sdk-runtime: ...@@ -66,10 +61,6 @@ build-sdk-runtime:
extends: extends:
- .build - .build
stage: build runtime stage: build runtime
before_script:
- apt update
- apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
- chmod 0400 "$ARCHIVE_SECRET_FILE"
script: script:
- /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 --sdk runtimes runtimes/org.apertis.demo.yaml - /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${APERTIS_RELEASE} --arch=amd64 --sdk runtimes runtimes/org.apertis.demo.yaml
- | - |
...@@ -89,10 +80,6 @@ build-app: ...@@ -89,10 +80,6 @@ build-app:
extends: extends:
- .build - .build
stage: build app stage: build app
before_script:
- apt update
- apt install -y binutils debootstrap debos flatpak ostree pigz python3 python3-debian python3-gi python3-yaml systemd-container time flatpak-builder
- chmod 0400 "$ARCHIVE_SECRET_FILE"
script: script:
- | - |
case "$CI_COMMIT_REF_NAME" in case "$CI_COMMIT_REF_NAME" in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment