Compare commits

...

6 Commits

Author SHA1 Message Date
ibuler
a659027fca ci(docker): 使用docker缓存,使用npm mirror 2020-08-03 14:04:31 +08:00
OrangeM21
885db06903 fix: 添加form组件的refs 2020-07-21 15:03:32 +08:00
Orange
94adc4d951 Merge pull request #226 from jumpserver/pr@v2.0@ci_add_generic_handler
ci(github): 添加通用action
2020-07-21 13:09:14 +08:00
github-actions
f8815bf9e9 ci(github): 添加通用action 2020-07-21 13:05:07 +08:00
Orange
3b0d8f34a9 Merge pull request #210 from jumpserver/pr_v2.0_ci-change
ci(pull-request): 添加自动pr打标签功能
2020-07-17 16:14:34 +08:00
ibuler
92723d4984 ci(pull-request): 添加自动pr打标签功能 2020-07-17 16:07:18 +08:00
4 changed files with 64 additions and 22 deletions

View File

@@ -0,0 +1,12 @@
on: [push, pull_request, release]
name: JumpServer repos generic handler
jobs:
generic_handler:
name: Run generic handler
runs-on: ubuntu-latest
steps:
- uses: jumpserver/action-generic-handler@master
env:
GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}

View File

@@ -1,10 +1,22 @@
FROM node:10 as stage-build
ARG VERSION
ENV VERSION=$VERSION
ARG NPM_REGISTRY="https://registry.npm.taobao.org"
ENV NPM_REGISTY=$NPM_REGISTRY
ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
ENV SASS_BINARY_SITE=$SASS_BINARY_SITE
WORKDIR /data
RUN npm config set sass_binary_site=${SASS_BINARY_SITE}
RUN npm config set registry ${NPM_REGISTRY}
RUN yarn config set registry ${NPM_REGISTRY}
COPY package.json yarn.lock /data/
COPY utils /data/utils/
RUN ls && cd utils && bash -xieu build.sh dep
ADD . /data
RUN cd utils && bash -xieu build.sh
RUN cd utils && bash -xieu build.sh build
FROM nginx:alpine
COPY --from=stage-build /data/release/lina /opt/lina

View File

@@ -1,7 +1,7 @@
<template>
<Page>
<IBox>
<GenericCreateUpdateForm v-bind="$attrs" v-on="$listeners" />
<GenericCreateUpdateForm ref="createUpdateForm" v-bind="$attrs" v-on="$listeners" />
</IBox>
</Page>
</template>

View File

@@ -5,34 +5,52 @@ utils_dir=$(pwd)
project_dir=$(dirname "$utils_dir")
release_dir=${project_dir}/release
if [[ $(uname) == 'Darwin' ]];then
if [[ $(uname) == 'Darwin' ]]; then
alias sedi="sed -i ''"
else
alias sedi='sed -i'
fi
function change_version() {
sedi "s@Version <strong>.*</strong>@Version <strong>${VERSION}</strong>@g" "${project_dir}/src/layout/components/Footer/index.vue" || return 2
sedi "s@Version <strong>.*</strong>@Version <strong>${VERSION}</strong>@g" "${project_dir}/src/layout/components/Footer/index.vue" || return 2
}
# 修改版本号文件
if [[ -n ${VERSION-''} ]]; then
change_version || exit 2
fi
function install_deps() {
# 下载依赖模块并构建
cd "${project_dir}" || exit 3
yarn install --verbose || exit 4
npm rebuild node-sass || exit 5
}
# 下载依赖模块并构建
cd "${project_dir}" || exit 3
yarn || exit 4
rm -rf lina dist
yarn build:prod || exit 5
function build() {
cd "${project_dir}" || exit 1
# 修改版本号文件
if [[ -n ${VERSION-''} ]]; then
change_version || exit 2
fi
rm -rf lina dist
yarn build:prod || exit 5
# 打包
rm -rf "${release_dir:?}"/*
mkdir -p "${release_dir}"
to_dir="${release_dir}/lina"
# 打包
rm -rf "${release_dir:?}"/*
mkdir -p "${release_dir}"
to_dir="${release_dir}/lina"
if [[ -d "dist" ]]; then
mv dist "${to_dir}"
elif [[ -d "lina" ]]; then
mv lina "${to_dir}"
fi
}
if [[ -d "dist" ]];then
mv dist "${to_dir}"
elif [[ -d "lina" ]]; then
mv lina "${to_dir}"
fi
case "${1-}" in
dep)
install_deps
;;
build)
build
;;
*)
install_deps
build
;;
esac