Merge branch 'Anne/Combine-CI-Artefacts' into 'XX-4431/Emoji'

Update .gitlab-ci.yml

See merge request !62

.gitlab-ci.yml

@@ -21,7 +21,7 @@ stages:
   - build
   - tag
   - doc-update
-  - version_check
+  - combine_artefacts
 
 build:
   stage: build
@@ -35,6 +35,7 @@ build:
   artifacts:
     paths:
       - release/
+    expire_in: 1 hour
 
 go-test:
   stage: test
@@ -56,6 +57,7 @@ emoji-update:
   artifacts:
     paths:
       - release/
+    expire_in: 1 hour
 
 wasm-test:
   stage: test
@@ -74,17 +76,29 @@ wasm-test:
     - GOOS=js GOARCH=wasm go test ./indexedDb/... -v
     - GOOS=js GOARCH=wasm go test ./... -v
 
-version_check:
-  stage: version_check
+combine_artefacts:
+  stage: combine_artefacts
   except:
     - tags
-  only:
-    - master
   image: $DOCKER_IMAGE
   script:
-    - GITTAG=$(git describe --tags)
-    - CODEVERS=$(cat storage/version.go | grep "const SEMVER =" | cut -d ' ' -f4 | tr -d '"')
-    - if [[ $GITTAG != $CODEVERS ]]; then echo "VERSION NUMBER BAD $GITTAG != $CODEVERS"; exit -1; fi
+    - echo $CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs
+    - 'PIPELINE_JOBS=$(curl --header "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" $CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs)'
+    - echo $PIPELINE_JOBS
+    - BUILD_JOB_JSON=$(echo $WASM_PIPELINE_JOB | jq '.[] | select(.name=="build")')
+    - EMOJI_UPDATE_JOB_JSON=$(echo $PIPELINE_JOBS | jq '.[] | select(.name=="emoji-update")')
+
+    - BUILD_JOB_ID=$(echo $BUILD_JOB_JSON | jq -r '.["id"]')
+    - EMOJI_UPDATE_JOB_ID=$(echo $EMOJI_UPDATE_JOB_JSON | jq -r '.["id"]')
+
+    - mkdir -p release
+
+    - 'curl --header "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" --output release/wasm_exec.js $CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/jobs/$BUILD_JOB_ID/artifacts/release/wasm_exec.js'
+    - 'curl --header "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" --output release/xxdk.wasm $CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/jobs/$BUILD_JOB_ID/artifacts/release/xxdk.wasm'
+    - 'curl --header "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" --output release/emojiSet.json $CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/jobs/$EMOJI_UPDATE_JOB_ID/artifacts/release/emojiSet.json'
+  artifacts:
+    paths:
+      - release/
 
 tag:
   stage: build