From 1cf46ef10700fcd200e09b261bbdcba7d2fa876d Mon Sep 17 00:00:00 2001
From: Lansana DIOMANDE <ldiomande@takima.fr>
Date: Tue, 10 May 2022 10:02:45 +0200
Subject: [PATCH] fix: update ci
---
.gitlab-ci.yml | 4 +++-
build-recorder.sh | 1 -
build.sh | 4 ----
plugins/.gitkeep | 0
4 files changed, 3 insertions(+), 6 deletions(-)
create mode 100644 plugins/.gitkeep
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7ac262d..30dd0533 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ before_script:
- apk add yarn
- apk add curl
- export TAG=${CI_COMMIT_TAG:-latest}
+ - ./setup.sh
build:
stage: build
@@ -24,8 +25,9 @@ build:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY
- docker push $CI_REGISTRY_IMAGE/$VERSION:$TAG
rules:
- - if: $CI_COMMIT_BRANCH == "develop"
+ - if: $CI_COMMIT_BRANCH == "main"
- if: $CI_COMMIT_TAG != null
+
desktop_extension:package:pre-release:
stage: build
cache:
diff --git a/build-recorder.sh b/build-recorder.sh
index bdf97966..2ae07c7d 100755
--- a/build-recorder.sh
+++ b/build-recorder.sh
@@ -6,7 +6,6 @@ OUTPUT_DIR='recorder-out'
cd ./deadlock-plugins/deadlock-extension/
-npm install
npm run build-recorder
cd -
diff --git a/build.sh b/build.sh
index 6d9e150b..960fcd0c 100755
--- a/build.sh
+++ b/build.sh
@@ -10,10 +10,6 @@ DOCKERFILE="Dockerfile.$VERSION"
echo "Building Dockerfile.$VERSION"
-echo '====================================================='
-echo '================= BUILDING PLUGINS =================='
-echo '====================================================='
-./build-plugins.sh
echo '====================================================='
echo '================= BUILDING RECORDER ================='
echo '====================================================='
diff --git a/plugins/.gitkeep b/plugins/.gitkeep
new file mode 100644
index 00000000..e69de29b
--
GitLab