summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2021-05-14 11:41:16 -0400
committerGitHub <noreply@github.com>2021-05-14 11:41:16 -0400
commit9574cb4c956652372789d0c81d2cb7d35e36369c (patch)
tree50345a629f3714edd60e8d9ab6417238b9077dfc /.github
parent48dd96c5325d3d5b9b9e5412701d2e2bb6fe383a (diff)
Bundle the react dashboard code into the agent repo directly. (#11139)
* Remove code for bundling the dashoard on install. * Bundle the dashboard code directly into the agent repo. This diffstat looks huge, but it’s actually relatively simple. The only _actual_ changes are in the Makefiles, `configure.ac`, and the addition of `generate_dashboard_makefile.py`. Everything else consists of removing files that are included in the dashboard tarball, and extracting the contents of the tarball into `web/gui/dashboard`. * CI cleanup. * Automate bundling of the dashboard code. This replaces the makefile generator script with one that handles bundling of the dashboard code in it’s entirety, and updates the GHA workflow used for generating dashboard PRs to use that instead of the existing shell commands. It also removes the packaging/dashboard.* files, as they are no longer needed.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/checks.yml22
-rw-r--r--.github/workflows/dashboard-pr.yml9
2 files changed, 3 insertions, 28 deletions
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index efe61c35f3..e4025dd207 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -19,28 +19,6 @@ jobs:
LOCAL_ONLY: "true"
run: |
./tests/installer/checksums.sh
- dashboard-checks:
- name: Dashboard
- runs-on: ubuntu-latest
- steps:
- - name: Git clone repository
- uses: actions/checkout@v2
- with:
- submodules: recursive
- - name: Install required packages
- run: |
- ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
- - name: Backup dashboard.js
- run: |
- cp web/gui/dashboard.js /tmp/dashboard.js
- - name: Regenerate dashboard.js
- run: |
- autoreconf -ivf
- ./configure --enable-maintainer-mode
- make dist
- - name: Compare generated Dashboard vs. Backed up Dashboard
- run: |
- diff -sNrdu /tmp/dashboard.js web/gui/dashboard.js
libressl-checks:
name: LibreSSL
runs-on: ubuntu-latest
diff --git a/.github/workflows/dashboard-pr.yml b/.github/workflows/dashboard-pr.yml
index e1ce4705d8..8f5a40f2be 100644
--- a/.github/workflows/dashboard-pr.yml
+++ b/.github/workflows/dashboard-pr.yml
@@ -27,14 +27,11 @@ jobs:
git push -u origin dashboard-${{ github.event.inputs.dashboard_version }}
- name: Update Files
run: |
- curl -o dashboard.tar.gz https://github.com/netdata/dashboard/releases/download/${{ github.event.inputs.dashboard_version }}/dashboard.tar.gz
- echo ${{ github.event.inputs.dashboard_version }} > packaging/dashboard.version
- sha256sum dashboard.tar.gz > packaging/dashboard.checksums
- rm dashboard.tar.gz
+ web/gui/bundle_dashboard.py ${{ github.event.inputs.dashboard_version }}
- name: Commit Changes
uses: swinton/commit@v2.x
env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GH_TOKEN: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}
with:
files: |
packaging/dashboard.version
@@ -47,4 +44,4 @@ jobs:
source_branch: dashboard-${{ github.event.inputs.dashboard_version }}
pr_title: 'Update dashboard to version ${{ github.event.inputs.dashboard_version }}.'
pr_body: 'See https://github.com/netdata/dashboard/releases/tag/${{ github.event.inputs.dashboard_version }} for changes.'
- github_token: ${{ secrets.GITHUB_TOKEN }}
+ github_token: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}