Merge branch 'develop' into phoenix1.7

.gitlab-ci.yml

@@ -66,13 +66,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:
@@ -86,6 +94,8 @@ spec-build:
   - mix pleroma.openapi_spec spec.json
 
 benchmark:
+  extends:
+  - .using-ci-base
   stage: benchmark
   when: manual
   variables:
@@ -100,7 +110,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
@@ -122,7 +134,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
@@ -156,7 +170,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:
@@ -187,7 +203,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:
@@ -213,7 +231,7 @@ docs-deploy:
   before_script:
   - apk add curl
   script:
-  - curl -X POST -F"token=$DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" https://git.pleroma.social/api/v4/projects/673/trigger/pipeline
+  - curl --fail-with-body -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" https://git.pleroma.social/api/v4/projects/673/trigger/pipeline
 review_app:
   image: alpine:3.9
   stage: deploy
@@ -254,7 +272,7 @@ spec-deploy:
   before_script:
     - apk add curl
   script:
-    - curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline
+    - curl --fail-with-body -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline
 
 
 stop_review_app: