pleroma

commit: 8cf231c0d101fc7358180fecd328fb38764da9d1
parent 48e490cd585dd20922a667ef8573ce52154adeea
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sun,  2 Jul 2023 20:20:49 +0000

Merge branch 'tusooa/3151-amd64-runner' into 'develop'

Force the use of amd64 runners for jobs using ci-base

Closes #3151

See merge request pleroma/pleroma!3913
Diffstat:
M
.gitlab-ci.yml
28
+++++++++++++++++++++++-----
A
changelog.d/amd64-runner.skip
0

2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -65,13 +65,21 @@ check-changelog:
         - "**/*.exs"
         - "mix.lock"
 
+.using-ci-base:
+  tags:
+    - amd64
+
 build:
-  extends: .build_changes_policy
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
   stage: build
   script:
   - mix compile --force
 
 spec-build:
+  extends:
+  - .using-ci-base
   stage: test
   rules:
     - changes:
@@ -85,6 +93,8 @@ spec-build:
   - mix pleroma.openapi_spec spec.json
 
 benchmark:
+  extends:
+  - .using-ci-base
   stage: benchmark
   when: manual
   variables:
@@ -99,7 +109,9 @@ benchmark:
     - mix pleroma.load_testing
 
 unit-testing:
-  extends: .build_changes_policy
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
   stage: test
   cache: &testing_cache_policy
     <<: *global_cache_policy
@@ -121,7 +133,9 @@ unit-testing:
         path: coverage.xml
 
 unit-testing-erratic:
-  extends: .build_changes_policy
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
   stage: test
   retry: 2
   allow_failure: true
@@ -155,7 +169,9 @@ unit-testing-erratic:
 #     - mix test --trace --only federated
 
 unit-testing-rum:
-  extends: .build_changes_policy
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
   stage: test
   cache: *testing_cache_policy
   services:
@@ -186,7 +202,9 @@ lint:
     - mix format --check-formatted
 
 analysis:
-  extends: .build_changes_policy
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
   stage: test
   cache: *testing_cache_policy
   script:
diff --git a/changelog.d/amd64-runner.skip b/changelog.d/amd64-runner.skip