diff --git a/.auto-changelog b/.auto-changelog index adb549909..d44def5ad 100644 --- a/.auto-changelog +++ b/.auto-changelog @@ -1,7 +1,7 @@ { "template": "./changelog.hbs", "unreleased": true, - "commitLimit": true, - "ignoreCommitPattern": "^Release.*", + "commitLimit": false, + "ignoreCommitPattern": "^(Release|no log:).*", "sortCommits": "date-desc" } \ No newline at end of file diff --git a/.github/workflows/release_major_and_merge.yaml b/.github/workflows/release_dev_to_master.yaml similarity index 53% rename from .github/workflows/release_major_and_merge.yaml rename to .github/workflows/release_dev_to_master.yaml index eab4ff06c..afabd9acc 100644 --- a/.github/workflows/release_major_and_merge.yaml +++ b/.github/workflows/release_dev_to_master.yaml @@ -1,12 +1,19 @@ -name: release_major_and_merge -on: workflow_dispatch +name: release_dev_to_master +on: + workflow_dispatch: + inputs: + increment: + description: "Increment Type (major, minor, patch)" + required: true + default: "patch" jobs: Release: runs-on: ubuntu-latest env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + UI_DIRECTORY: ./frontend + ASSET_DIRECTORY: ./__builds__ steps: - name: Validate branch if: ${{ github.ref != 'refs/heads/development' }} @@ -20,33 +27,30 @@ jobs: fetch-depth: 0 ref: development + - name: Setup Git + run: git config --global user.name "github-actions" + - name: Setup NodeJS uses: actions/setup-node@v2 with: node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft + - name: Install Global Tools + run: npm install -g release-it @release-it/bumper auto-changelog - - name: Define LAST_VERSION environment variable + - name: Save UI to Asset run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV + mkdir -p ../.${{ env.ASSET_DIRECTORY }} && + zip -r ../.${{ env.ASSET_DIRECTORY }}/ui.zip ./ -x '*.map' -b $(mktemp -d) + working-directory: ${{ env.UI_DIRECTORY }}/build - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "major"}' + - name: Create Release + run: release-it --ci --increment ${{ github.event.inputs.increment }} Merge: needs: Release runs-on: ubuntu-latest steps: - - name: Checkout source code + - name: Checkout uses: actions/checkout@v2 - name: Merge development -> master diff --git a/.github/workflows/release_minor_and_merge.yaml b/.github/workflows/release_minor_and_merge.yaml deleted file mode 100644 index 22747af24..000000000 --- a/.github/workflows/release_minor_and_merge.yaml +++ /dev/null @@ -1,58 +0,0 @@ -name: release_minor_and_merge -on: workflow_dispatch - -jobs: - Release: - runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - steps: - - name: Validate branch - if: ${{ github.ref != 'refs/heads/development' }} - run: | - echo This action can only be run on development branch, not ${{ github.ref }} - exit 1 - - - name: Checkout source code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: development - - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft - - - name: Define LAST_VERSION environment variable - run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV - - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "minor"}' - Merge: - needs: Release - runs-on: ubuntu-latest - steps: - - name: Checkout source code - uses: actions/checkout@v2 - - - name: Merge development -> master - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: development - target_branch: master - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_patch_and_merge.yaml b/.github/workflows/release_patch_and_merge.yaml deleted file mode 100644 index 48eaab941..000000000 --- a/.github/workflows/release_patch_and_merge.yaml +++ /dev/null @@ -1,58 +0,0 @@ -name: release_patch_and_merge -on: workflow_dispatch - -jobs: - Release: - runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - steps: - - name: Validate branch - if: ${{ github.ref != 'refs/heads/development' }} - run: | - echo This action can only be run on development branch, not ${{ github.ref }} - exit 1 - - - name: Checkout source code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: development - - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft - - - name: Define LAST_VERSION environment variable - run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV - - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "patch"}' - Merge: - needs: Release - runs-on: ubuntu-latest - steps: - - name: Checkout source code - uses: actions/checkout@v2 - - - name: Merge development -> master - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: development - target_branch: master - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.release-it.json b/.release-it.json index dca102111..988214820 100644 --- a/.release-it.json +++ b/.release-it.json @@ -6,7 +6,8 @@ }, "github": { "release": true, - "releaseName": "v${version}" + "releaseName": "v${version}", + "assets": ["__builds__/*.zip"] }, "npm": { "publish": false, diff --git a/VERSION b/VERSION index ad1c8fc7f..e115aa587 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.4-beta.8 \ No newline at end of file +0.9.4-beta.9 \ No newline at end of file diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json index 4a2ddbfa7..e5519fade 100644 --- a/frontend/build/asset-manifest.json +++ b/frontend/build/asset-manifest.json @@ -1,24 +1,24 @@ { "files": { - "main.css": "./static/css/main.d2d8be2d.chunk.css", - "main.js": "./static/js/main.2f033b86.chunk.js", - "main.js.map": "./static/js/main.2f033b86.chunk.js.map", + "main.css": "./static/css/main.e5caf7d4.chunk.css", + "main.js": "./static/js/main.b1f6d8f0.chunk.js", + "main.js.map": "./static/js/main.b1f6d8f0.chunk.js.map", "runtime-main.js": "./static/js/runtime-main.28e08986.js", "runtime-main.js.map": "./static/js/runtime-main.28e08986.js.map", "static/css/2.79026e13.chunk.css": "./static/css/2.79026e13.chunk.css", - "static/js/2.9bf2f688.chunk.js": "./static/js/2.9bf2f688.chunk.js", - "static/js/2.9bf2f688.chunk.js.map": "./static/js/2.9bf2f688.chunk.js.map", + "static/js/2.ce0a71b3.chunk.js": "./static/js/2.ce0a71b3.chunk.js", + "static/js/2.ce0a71b3.chunk.js.map": "./static/js/2.ce0a71b3.chunk.js.map", "index.html": "./index.html", "static/css/2.79026e13.chunk.css.map": "./static/css/2.79026e13.chunk.css.map", - "static/css/main.d2d8be2d.chunk.css.map": "./static/css/main.d2d8be2d.chunk.css.map", - "static/js/2.9bf2f688.chunk.js.LICENSE.txt": "./static/js/2.9bf2f688.chunk.js.LICENSE.txt", + "static/css/main.e5caf7d4.chunk.css.map": "./static/css/main.e5caf7d4.chunk.css.map", + "static/js/2.ce0a71b3.chunk.js.LICENSE.txt": "./static/js/2.ce0a71b3.chunk.js.LICENSE.txt", "static/media/300.css": "./static/media/roboto-vietnamese-300-normal.54344cce.woff2" }, "entrypoints": [ "static/js/runtime-main.28e08986.js", "static/css/2.79026e13.chunk.css", - "static/js/2.9bf2f688.chunk.js", - "static/css/main.d2d8be2d.chunk.css", - "static/js/main.2f033b86.chunk.js" + "static/js/2.ce0a71b3.chunk.js", + "static/css/main.e5caf7d4.chunk.css", + "static/js/main.b1f6d8f0.chunk.js" ] } \ No newline at end of file diff --git a/frontend/build/index.html b/frontend/build/index.html index 43bd2fd4a..12688db0a 100644 --- a/frontend/build/index.html +++ b/frontend/build/index.html @@ -1 +1 @@ -
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 4\n text-decoration-skip-ink: none; // 5\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\nb,\nstrong {\n font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n @include font-size(75%);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n\n @include hover() {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([class]) {\n color: inherit;\n text-decoration: none;\n\n @include hover() {\n color: inherit;\n text-decoration: none;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // Disable auto-hiding scrollbar in IE & legacy Edge to avoid overlap,\n // making it impossible to interact with the content\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\n// 1. Removes font-weight bold by inheriting\n// 2. Matches default `