aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2024-05-23 16:45:17 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2024-05-23 16:45:17 +0000
commit82db31f7ac32443b2a5d51ed3ce6d52cd9dcfac7 (patch)
tree8933bcfaec62cd0f9053b5179929e0f4984be5aa
parentfd1011f622870385d8a694d60b66269e731b36cd (diff)
parent5810f6f4318e65d51f004d89259c37182945c422 (diff)
Merge branch 'ci-update' into 'develop'
Update gitlab CI file to avoid arm runner that keeps failing certain resource-intensive tasks See merge request pleroma/pleroma-fe!1914
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--changelog.d/ci-runner.skip1
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b4452d5..25e499c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,8 @@ lint:
test:
stage: test
+ tags:
+ - amd64
variables:
APT_CACHE_DIR: apt-cache
script:
@@ -54,6 +56,8 @@ test:
build:
stage: build
+ tags:
+ - amd64
script:
- yarn
- npm run build
diff --git a/changelog.d/ci-runner.skip b/changelog.d/ci-runner.skip
new file mode 100644
index 00000000..ad4b79d5
--- /dev/null
+++ b/changelog.d/ci-runner.skip
@@ -0,0 +1 @@
+stop using that one runner for intensive tasks \ No newline at end of file