chore(merge): bypass pull request, and merge directly

kcnt-deprecated · Dec 9, 2018 · b6bf9c2 · b6bf9c2
2 parents 6208c13 + 67616ba
commit b6bf9c2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -86,7 +86,9 @@ jobs:
             - ~/repo/node_modules
       - run:
           name: Start create deployment in Github https://github.com/kamontat/Portfolio/deployments
-          command: scripts/sh/create-deployments production
+          command: |
+            scripts/sh/create-deployments production
+            echo "$gh_deploy_id"
       - run:
           name: Setup git configuration
           command: |
@@ -100,7 +102,7 @@ jobs:
           command: yarn docs:deploy
       - run:
           name: Get deployment ID
-          command: echo "$gh_deploy_id"
+          command: echo "$GH_DEPLOY_ID"
       - run:
           name: Notify deployments completed
           command: scripts/sh/notify-deployments success

diff --git a/_redirects → dist/_redirects b/_redirects → dist/_redirects
diff --git a/scripts/sh/create-deployments b/scripts/sh/create-deployments
@@ -44,4 +44,6 @@ gh_deploy_id=$("${script}/../js/parseJSON.js" "$created_gh_deployment" "id")
 declare -xr created_gh_deployment
 declare -xr gh_deploy_id
 
+echo "export GH_DEPLOY_ID=\"$gh_deploy_id\"" >>"$BASH_ENV"
+
 cd "$curr" || exit 1
diff --git a/scripts/sh/notify-deployments b/scripts/sh/notify-deployments
@@ -32,4 +32,4 @@ notify_gh_about_a_deployment() {
 }
 
 # When a deploy is successful:
-notify_gh_about_a_deployment "$gh_deploy_id" "${1}"
+notify_gh_about_a_deployment "$GH_DEPLOY_ID" "${1}"
diff --git a/static/cms/net/config.yml b/static/cms/net/config.yml
@@ -408,7 +408,7 @@ collections:
     identifier_field: language
     editor:
       preview: false
-    slug: "{{year}}-{{month}}-{{day}}{{slug}}"
+    slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
     fields:
       - label: Name
         name: language
@@ -418,15 +418,15 @@ collections:
         widget: select
         options:
           - label: Elementary proficiency
-            value: 1
-          - label: Limited working proficiency
             value: 2
-          - label: Professional working proficiency
+          - label: Limited working proficiency
             value: 3
-          - label: Full professional proficiency
+          - label: Professional working proficiency
             value: 4
+          - label: Full professional proficiency
+            value: 5
           - label: Native or bilingual proficiency
-            value: 0
+            value: 1
   - label: Interests
     name: interests
     extension: json

diff --git a/static/cms/prang/config.yml b/static/cms/prang/config.yml
@@ -408,7 +408,7 @@ collections:
     identifier_field: language
     editor:
       preview: false
-    slug: "{{year}}-{{month}}-{{day}}{{slug}}"
+    slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
     fields:
       - label: Name
         name: language
@@ -418,15 +418,15 @@ collections:
         widget: select
         options:
           - label: Elementary proficiency
-            value: 1
-          - label: Limited working proficiency
             value: 2
-          - label: Professional working proficiency
+          - label: Limited working proficiency
             value: 3
-          - label: Full professional proficiency
+          - label: Professional working proficiency
             value: 4
+          - label: Full professional proficiency
+            value: 5
           - label: Native or bilingual proficiency
-            value: 0
+            value: 1
   - label: Interests
     name: interests
     extension: json