Fixed naming for .gitlab-ci.yaml and synced concurrency from native

Author: CMCDragonkai

.gitlab-ci.yml

@@ -9,6 +9,8 @@ default:
   interruptible: true
 
 variables:
+  GH_PROJECT_PATH: "MatrixAI/${CI_PROJECT_NAME}"
+  GH_PROJECT_URL: "https://${GITHUB_TOKEN}@github.com/${GH_PROJECT_PATH}.git"
   GIT_SUBMODULE_STRATEGY: recursive
   # Cache .npm
   NPM_CONFIG_CACHE: "${CI_PROJECT_DIR}/tmp/npm"
@@ -94,12 +96,10 @@ check:test:
 build:merge:
   stage: build
   needs: []
-  # Don't interrupt pr creation job
-  interruptible: false
   allow_failure: true
   script:
     # Required for `gh pr create`
-    - git remote add upstream "https://${GITHUB_TOKEN}@github.com/MatrixAI/TypeScript-Demo-Lib-Native.git"
+    - git remote add upstream "$GH_PROJECT_URL"
     - >
         nix-shell -I nixpkgs=./pkgs.nix --packages gitAndTools.gh --run '
         gh pr create \
@@ -109,10 +109,11 @@ build:merge:
           --body "This is an automatic PR generated by the pipeline CI/CD. This will be automatically fast-forward merged if successful." \
           --assignee "@me" \
           --no-maintainer-edit \
-          --repo MatrixAI/TypeScript-Demo-Lib-Native || true;
-        gh pr comment staging \
-          --body "Pipeline Attempt ${CI_PIPELINE_ID} - ${CI_PIPELINE_URL}" \
-          --repo MatrixAI/TypeScript-Demo-Lib-Native;
+          --repo "$GH_PROJECT_PATH" || true;
+        printf "Pipeline Attempt on ${CI_PIPELINE_ID} for ${CI_COMMIT_SHA}\n\n${CI_PIPELINE_URL}" \
+        | gh pr comment staging \
+          --body-file - \
+          --repo "$GH_PROJECT_PATH";
         '
   rules:
     # Runs on staging commits and ignores version commits
@@ -136,7 +137,6 @@ build:linux:
     reports:
       junit:
         - ./tmp/junit.xml
-    paths:
       # Only the build:linux preserves the dist
       - ./dist
   rules:
@@ -214,7 +214,6 @@ build:prerelease:
     - build:macos
   # Don't interrupt publishing job
   interruptible: false
-  allow_failure: true
   before_script:
     - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ./.npmrc
   script:
@@ -276,6 +275,8 @@ integration:deployment:
     - integration:builds
   # Don't interrupt deploying job
   interruptible: false
+  # Requires mutual exclusion
+  resource_group: integration:deployment
   script:
     - echo 'Perform service deployment for integration testing'
   rules:
@@ -390,12 +391,11 @@ integration:prerelease:
       optional: true
   # Don't interrupt publishing job
   interruptible: false
-  allow_failure: true
   script:
     - echo 'Publishing application prerelease'
     - >
         nix-shell -I nixpkgs=./pkgs.nix --packages gitAndTools.gh --run '
-        if gh release view "$CI_COMMIT_TAG" --repo MatrixAI/TypeScript-Demo-Lib-Native >/dev/null; then \
+        if gh release view "$CI_COMMIT_TAG" --repo "$GH_PROJECT_PATH" >/dev/null; then \
           gh release \
             upload "$CI_COMMIT_TAG" \
             builds/*.closure.gz \
@@ -404,7 +404,7 @@ integration:prerelease:
             builds/*-win-* \
             builds/*-macos-* \
             --clobber \
-            --repo MatrixAI/TypeScript-Demo-Lib-Native; \
+            --repo "$GH_PROJECT_PATH"; \
         else \
           gh release \
             create "$CI_COMMIT_TAG" \
@@ -417,11 +417,11 @@ integration:prerelease:
             --notes "" \
             --prerelease \
             --target staging \
-            --repo MatrixAI/TypeScript-Demo-Lib-Native; \
+            --repo "$GH_PROJECT_PATH"; \
         fi;
         '
   rules:
-    # Only runs on tag pipeline where the tag is a release version
+    # Only runs on tag pipeline where the tag is a prerelease version
     # This requires dependencies to also run on tag pipeline
     # However version tag comes with a version commit
     # Dependencies must not run on the version commit
@@ -447,8 +447,8 @@ integration:merge:
     - job: integration:macos
       artifacts: false
       optional: true
-  # Don't interrupt pr merging job
-  interruptible: false
+  # Requires mutual exclusion
+  resource_group: integration:merge
   allow_failure: true
   variables:
     # Ensure that CI/CD is fetching all commits
@@ -458,13 +458,15 @@ integration:merge:
   script:
     - >
         nix-shell -I nixpkgs=./pkgs.nix --packages gitAndTools.gh --run '
-        gh pr comment staging \
-          --body "Pipeline Succeeded ${CI_PIPELINE_ID} - ${CI_PIPELINE_URL}" \
-          --repo MatrixAI/TypeScript-Demo-Lib-Native;
+        printf "Pipeline Succeeded on ${CI_PIPELINE_ID} for ${CI_COMMIT_SHA}\n\n${CI_PIPELINE_URL}" \
+        | gh pr comment staging \
+          --body-file - \
+          --repo "$GH_PROJECT_PATH";
         '
-    - git remote add upstream "https://${GITHUB_TOKEN}@github.com/MatrixAI/TypeScript-Demo-Lib-Native.git"
+    - git remote add upstream "$GH_PROJECT_URL"
     - git checkout origin/master
-    - git merge --ff-only origin/staging
+    # Merge up to the current commit (not the latest commit)
+    - git merge --ff-only "$CI_COMMIT_SHA"
     - git push upstream HEAD:master
   rules:
     # Runs on staging commits and ignores version commits
@@ -483,6 +485,8 @@ release:deployment:
       artifacts: true
   # Don't interrupt deploying job
   interruptible: false
+  # Requires mutual exclusion
+  resource_group: release:deployment
   script:
     - echo 'Perform service deployment for production'
   rules:
@@ -516,7 +520,6 @@ release:distribution:
       artifacts: true
   # Don't interrupt publishing job
   interruptible: false
-  allow_failure: true
   before_script:
     - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ./.npmrc
   script:
@@ -537,7 +540,7 @@ release:distribution:
           --title "Build-$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
           --notes "" \
           --target master \
-          --repo MatrixAI/TypeScript-Demo-Lib-Native;
+          --repo "$GH_PROJECT_PATH";
         '
   after_script:
     - rm -f ./.npmrc