diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7ac262d6035dadebd033796f87850c7266c9ff0..30dd0533356c621db7af15056f8af9039cbc33c3 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 bdf979661c346d6b483aa9f5777f1f0e3f4e5430..2ae07c7d14d3e357c4015d7a82f22f49ad4deb1a 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 6d9e150bfdee0cc6aec9f8c2571cb891d3b5f3c3..960fcd0cb79449d16bd6620e5656abe1a148322a 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391