From 63b9f767824b47d52e615d14353d5b9a7e71929a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 1 Jul 2023 23:25:04 -0400
Subject: Force the use of amd64 runners for jobs using ci-base

---
 .gitlab-ci.yml | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8daa9f434..148cbe405 100644
--- 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:
-- 
cgit v1.2.3


From 10249d1e42fd809ab75880c891f00ca1f3318f80 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 4 Jul 2023 03:03:41 +0200
Subject: CI: Let curl return non-0 on http failure code

Otherwise it silently fails
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 148cbe405..81fd3d682 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,7 +230,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=$DOCS_PIPELINE_TRIGGER" -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
@@ -271,7 +271,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=$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
 
 
 stop_review_app:
-- 
cgit v1.2.3


From 8c3363a5e778899fe137273c2d188ebd3b9224fb Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 4 Jul 2023 03:23:32 +0200
Subject: CI: Use CI_JOB_TOKEN for cross-repo pipeline triggers

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81fd3d682..cd0561852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,7 +230,7 @@ docs-deploy:
   before_script:
   - apk add curl
   script:
-  - curl --fail-with-body -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
@@ -271,7 +271,7 @@ spec-deploy:
   before_script:
     - apk add curl
   script:
-    - curl --fail-with-body -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:
-- 
cgit v1.2.3