diff --git a/.gitlab-ci.elife.k8s.yml b/.gitlab-ci.elife.k8s.yml index 131fdd0e429cae9a8d33dce61edc471b87a65e5b..b52ec6dd5fac77c6410c39acd84a1f6997c44a03 100644 --- a/.gitlab-ci.elife.k8s.yml +++ b/.gitlab-ci.elife.k8s.yml @@ -37,26 +37,29 @@ stages: deploy: stage: deploy - #image: jshimko/kube-tools-aws:latest - image: ubuntu:18.04 + image: jshimko/kube-tools-aws:latest + #image: ubuntu:18.04 variables: AWS_ACCESS_KEY_ID: $ELIFE_AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY: $ELIFE_AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION: $ELIFE_AWS_DEFAULT_REGION ELIFE_CLUSTER_NAME: eks-elife-kotahi + TZ: Europe/Rome # before_script: # - touch ~/.elife_k8s_config # - echo "${ELIFE_K8S_CLUSTER_CONFIG}" >> ~/.elife_k8s_config script: - | - apt update - apt install awscli curl wget -y - curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl - chmod +x ./kubectl && sudo mv ./kubectl /usr/local/bin/kubectl - aws --version - kubectl version + #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + #apt update + #apt install awscli curl wget -y + #curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl + #chmod +x ./kubectl + #mv ./kubectl /usr/local/bin/kubectl + #aws --version + kubectl config --kubeconfig=$ELIFE_CLUSTER_NAME set-cluster $ELIFE_CLUSTER_NAME --server=${ELIFE_K8S_CLUSTER_HOST} --certificate-authority=${ELIFE_K8S_CLUSTER_CA_CERTIFICATE} #aws --region=$AWS_DEFAULT_REGION eks update-kubeconfig --name $ELIFE_CLUSTER_NAME - #kubectl cluster-info + kubectl cluster-info # helm repo add kotahi https://charts.bitnami.com/bitnami # helm dependency build helm/elife-kotahi # helm upgrade -i elife-kotahi \ diff --git a/server/model-manuscript/src/graphql.js b/server/model-manuscript/src/graphql.js index 31b091fe5d3e25de9942123094e5640b62f43c34..d3e9407d9b05b61ebf6cd78adfe21d94d60afa81 100644 --- a/server/model-manuscript/src/graphql.js +++ b/server/model-manuscript/src/graphql.js @@ -62,6 +62,10 @@ const commonUpdateManuscript = async (_, { id, input }, ctx) => { ...manuscript.submission, ...manuscriptDelta.submission, }, + meta: { + ...manuscript.meta, + ...manuscriptDelta.meta, + }, } // if (manuscript.status === 'revise') { @@ -274,10 +278,13 @@ const resolvers = { let manuscript = await ctx.models.Manuscript.query().findById(id) if (['elife'].includes(process.env.INSTANCE_NAME)) { - const turndownService = new TurndownService({bulletListMarker: '-'}) + const turndownService = new TurndownService({ bulletListMarker: '-' }) + const requestBody = { uri: manuscript.submission.articleURL, - text: turndownService.turndown(manuscript.submission.evaluationContent), + text: turndownService.turndown( + manuscript.submission.evaluationContent, + ), tags: [manuscript.submission.evalType], // group: "q5X6RWJ6", }