Skip to content

Commit ff3f533

Browse files
author
Jon Penwood
authored
Merge pull request #1 from polarityio/develop
Fixing regex to fit non-".proofpoint" primary domain
2 parents c2b8875 + b0b8327 commit ff3f533

File tree

4 files changed

+89
-3
lines changed

4 files changed

+89
-3
lines changed
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This workflow will run on merge of a PR or push to master
2+
# It will run the integration developement checklist and if that passes
3+
# creates a new release with the Release and Tag name both being the
4+
# package.json version and will with a created tgz file and the SHA256 has in the release body
5+
6+
7+
name: Release Current Version
8+
9+
on:
10+
push:
11+
branches: [ master ]
12+
13+
jobs:
14+
release-current-version:
15+
runs-on: ubuntu-latest
16+
container: 'centos:7'
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: actions/setup-node@v1
21+
- name: Get NPM Version
22+
id: package-version
23+
uses: martinbeentjes/npm-get-version-action@95bc31c6dd3145896c110e382f840bb1e750d09c
24+
- name: Create Build
25+
id: create_build
26+
run: |
27+
npm install &&
28+
cd .. &&
29+
tar --exclude="./${{ github.event.repository.name }}/.git" --exclude="./${{ github.event.repository.name }}/.gitignore" --exclude="./${{ github.event.repository.name }}/package-lock.json" --exclude="./${{ github.event.repository.name }}/.github" -czvf "${{ github.event.repository.name }}-${{ steps.package-version.outputs.current-version }}.tgz" "./${{ github.event.repository.name }}" &&
30+
echo "::set-output name=build_hash::$(sha256sum '${{ github.event.repository.name }}-${{ steps.package-version.outputs.current-version }}.tgz' | grep -oE '^[^ ]*' )" &&
31+
cd ${{ github.event.repository.name }}
32+
- name: Polarity Integration Development Checklist
33+
id: int-dev-checklist
34+
uses: polarityio/polarity-integration-development-checklist@v1.0.0
35+
with:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
- name: Create Versioned Release
38+
id: create_versioned_release
39+
uses: actions/create-release@v1
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
with:
43+
tag_name: ${{ steps.package-version.outputs.current-version}}
44+
release_name: ${{ steps.package-version.outputs.current-version}}
45+
body: |
46+
SHA256: ${{ steps.create_build.outputs.build_hash }}
47+
draft: false
48+
prerelease: false
49+
- name: Upload Release Asset
50+
id: upload-release-asset
51+
uses: actions/upload-release-asset@v1
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
with:
55+
upload_url: ${{ steps.create_versioned_release.outputs.upload_url }}
56+
asset_path: ../${{ github.event.repository.name }}-${{ steps.package-version.outputs.current-version}}.tgz
57+
asset_name: ${{ github.event.repository.name }}-${{ steps.package-version.outputs.current-version}}.tgz
58+
asset_content_type: application/gzip
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This workflow will run on a Pull Request is created on both master develop
2+
# It run as series of checks from the Integration Developement Checklist
3+
4+
5+
name: Run Integration Development Checklist
6+
7+
on:
8+
pull_request:
9+
branches: [ master, develop ]
10+
11+
jobs:
12+
run-integration-development-checklist:
13+
runs-on: ubuntu-latest
14+
container: 'centos:7'
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- uses: actions/setup-node@v1
19+
- name: Test NPM Install
20+
id: test-npm-install
21+
run: |
22+
npm install
23+
- name: Polarity Integration Development Checklist
24+
id: int-dev-checklist
25+
uses: polarityio/polarity-integration-development-checklist@v1.0.0
26+
with:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

config/config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = {
2626
customTypes: [
2727
{
2828
key: 'ppUrl',
29-
regex: /https:\/\/urldefense.proofpoint.com\S*/
29+
regex: /http(s?):\/\/urldefense.*com\S*/
3030
}
3131
],
3232
onDemandOnly: true,
@@ -69,7 +69,8 @@ module.exports = {
6969
ca: '',
7070
// An HTTP proxy to be used. Supports proxy Auth with Basic Auth, identical to support for
7171
// the url parameter (by embedding the auth info in the uri)
72-
proxy: ''
72+
proxy: '',
73+
rejectUnauthorized: true
7374
},
7475
logging: {
7576
level: 'info' //trace, debug, info, warn, error, fatal

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"main": "./integration.js",
33
"name": "ppurl",
4-
"version": "3.0.1",
4+
"version": "3.0.2",
55
"private": true,
66
"dependencies": {
77
"request": "^2.88.2",

0 commit comments

Comments
 (0)