From 80a3ced821b6d8405bfbaec2ed4043f09be11dc8 Mon Sep 17 00:00:00 2001 From: Dominik Korsa Date: Wed, 20 Jan 2021 15:49:32 +0100 Subject: [PATCH 1/2] Create test.yml --- .github/workflows/test.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..4a8e900 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,22 @@ +name: Test + +on: + push: + branches: [ develop ] + pull_request: + branches: [ develop ] + +jobs: + lint-and-build: + name: Lint and build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 12.x + uses: actions/setup-node@v1 + with: + node-version: 12.x + - run: npm ci + - run: npm run lint + - run: npm run build + From 950023074497a199ce8b38735a8cb4a9120425cf Mon Sep 17 00:00:00 2001 From: Dominik Korsa Date: Wed, 20 Jan 2021 16:05:38 +0100 Subject: [PATCH 2/2] Remove git hooks and Travis CI --- .github/workflows/deploy.yml | 26 ++++++++++++++++++++++++++ .travis.yml | 22 ---------------------- package.json | 13 ------------- 3 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/deploy.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..dbf4621 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,26 @@ +name: Deploy + +on: + push: + branches: [ develop ] + +jobs: + lint-and-build: + name: Deploy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 12.x + uses: actions/setup-node@v1 + with: + node-version: 12.x + - run: npm ci + - run: npm run build + - run: npm run sitemap + - name: Deploy to GitHub Pages + uses: JamesIves/github-pages-deploy-action@3.7.1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BRANCH: gh-pages + FOLDER: build + CLEAN: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fb5a7b9..0000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: node_js -node_js: - - "node" # Latest stable - -deploy: - provider: pages - skip-cleanup: true - target-branch: master - github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable - keep-history: true - local-dir: dist - on: - branch: develop - -branches: - except: - master - -script: - - npm run lint - - npm run build - - npm run sitemap diff --git a/package.json b/package.json index 4eadd63..0f08e31 100644 --- a/package.json +++ b/package.json @@ -38,18 +38,5 @@ "sass-loader": "^10.0.2", "vue-cli-plugin-sitemap": "^2.3.0", "vue-template-compiler": "^2.6.12" - }, - "gitHooks": { - "pre-commit": "lint-staged" - }, - "lint-staged": { - "*.js": [ - "vue-cli-service lint", - "git add" - ], - "*.vue": [ - "vue-cli-service lint", - "git add" - ] } }