From 24aa8bd54164303f1687b79384e7b77fa0ca4d55 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Tue, 29 Nov 2022 10:34:45 -0700 Subject: [PATCH 1/2] update for MPA --- .github/workflows/prod-release.yml | 133 ++++++++++++++++++++++------- 1 file changed, 102 insertions(+), 31 deletions(-) diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml index d08e246d4..8787fee86 100644 --- a/.github/workflows/prod-release.yml +++ b/.github/workflows/prod-release.yml @@ -5,6 +5,7 @@ on: workflow_dispatch env: EXCLUDE_SERVER: true EXCLUDE_ENTERPRISE: true + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} jobs: @@ -14,21 +15,39 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + path: "focalboard" + - id: "mattermostServer" + uses: actions/checkout@v3 + continue-on-error: true + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v3 + if: steps.mattermostServer.outcome == 'failure' + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref : "master" - name: Replace token 1 server - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 1 webapp - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: Replace token 2 server - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 2 webapp - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: npm ci - run: cd webapp; npm ci --no-optional + run: cd focalboard/webapp; npm ci --no-optional + run: cd focalboard/mattermost-plugin/webapp && npm ci - name: Set up Go uses: actions/setup-go@v3 @@ -50,7 +69,7 @@ jobs: run: sudo apt-get install libwebkit2gtk-4.0-dev - name: Build Linux server and app - run: make server-linux-package linux-app + run: cd focalboard; make server-linux-package linux-app env: BUILD_NUMBER: ${{ github.run_id }} @@ -58,13 +77,13 @@ jobs: uses: actions/upload-artifact@v3 with: name: focalboard-server-linux-amd64.tar.gz - path: ${{ github.workspace }}/dist/focalboard-server-linux-amd64.tar.gz + path: ${{ github.workspace }}/focalboard/dist/focalboard-server-linux-amd64.tar.gz - name: Upload app package uses: actions/upload-artifact@v3 with: name: focalboard-linux.tar.gz - path: ${{ github.workspace }}/linux/dist/focalboard-linux.tar.gz + path: ${{ github.workspace }}/focalboard/linux/dist/focalboard-linux.tar.gz macos: runs-on: macos-11 @@ -73,21 +92,39 @@ jobs: - name: Checkout uses: actions/checkout@v3 + with: + path: "focalboard" + - id: "mattermostServer" + uses: actions/checkout@v3 + continue-on-error: true + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v3 + if: steps.mattermostServer.outcome == 'failure' + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref : "master" - name: Replace token 1 server - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 1 webapp - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: Replace token 2 server - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 2 webapp - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: npm ci - run: cd webapp; npm ci --no-optional + run: cd focalboard/webapp; npm ci --no-optional + run: cd focalboard/mattermost-plugin/webapp && npm ci - name: Set up Go uses: actions/setup-go@v3 @@ -98,7 +135,7 @@ jobs: run: ls -n /Applications/ | grep Xcode* - name: Build macOS - run: make mac-app + run: cd focalboard; make mac-app env: DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer BUILD_NUMBER: ${{ github.run_id }} @@ -107,7 +144,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: focalboard-mac.zip - path: ${{ github.workspace }}/mac/dist/focalboard-mac.zip + path: ${{ github.workspace }}/focalboard/mac/dist/focalboard-mac.zip windows: runs-on: windows-2022 @@ -115,24 +152,41 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + path: "focalboard" + - id: "mattermostServer" + uses: actions/checkout@v3 + continue-on-error: true + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v3 + if: steps.mattermostServer.outcome == 'failure' + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref : "master" - name: Replace token 1 server - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 1 webapp - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: Replace token 2 server - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 2 webapp - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - name: npm ci - run: cd webapp; npm ci --no-optional + run: cd focalboard/webapp; npm ci --no-optional - name: Set up Go uses: actions/setup-go@v3 @@ -148,7 +202,7 @@ jobs: run: nuget restore win-wpf\Focalboard.sln - name: Build Windows WPF app - run: make win-wpf-app + run: cd focalboard; make win-wpf-app env: BUILD_NUMBER: ${{ github.run_id }} @@ -156,13 +210,13 @@ jobs: uses: actions/upload-artifact@v3 with: name: focalboard.msix - path: ${{ github.workspace }}/win-wpf/focalboard.msix + path: ${{ github.workspace }}/focalboard/win-wpf/focalboard.msix - name: Upload app zip package uses: actions/upload-artifact@v3 with: name: focalboard-win.zip - path: ${{ github.workspace }}/win-wpf/dist/focalboard-win.zip + path: ${{ github.workspace }}/focalboard/win-wpf/dist/focalboard-win.zip plugin-release: runs-on: ubuntu-18.04 @@ -170,21 +224,38 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + path: "focalboard" + - id: "mattermostServer" + uses: actions/checkout@v3 + continue-on-error: true + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v3 + if: steps.mattermostServer.outcome == 'failure' + with: + repository: "mattermost/mattermost-server" + fetch-depth: "20" + path: "mattermost-server" + ref : "master" - name: Replace token 1 server - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 1 webapp - run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: Replace token 2 server - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go - name: Replace token 2 webapp - run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/mattermost-plugin/webapp/src/index.tsx + run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/focalboard/mattermost-plugin/webapp/src/index.tsx - name: npm ci - run: cd webapp; npm ci --no-optional + run: cd focalboard/webapp; npm ci --no-optional - name: Set up Go uses: actions/setup-go@v3 @@ -197,10 +268,10 @@ jobs: node-version: 16.1.0 - name: Build webapp - run: make webapp + run: cd focalboard; make webapp - name: npm ci plugin dependencies - run: cd mattermost-plugin/webapp; npm ci --no-optional + run: cd focalboard/mattermost-plugin/webapp && npm ci - name: Build plugin run: cd mattermost-plugin; make dist @@ -214,4 +285,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: mattermost-plugin-focalboard.tar.gz - path: ${{ github.workspace }}/mattermost-plugin/dist/mattermost-plugin-focalboard.tar.gz + path: ${{ github.workspace }}/focalboard/mattermost-plugin/dist/mattermost-plugin-focalboard.tar.gz From 5db87a835340e0c9f7f0b26fe83b889e64950453 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Tue, 29 Nov 2022 11:52:50 -0700 Subject: [PATCH 2/2] don't check plugin when building ubuntu --- .github/workflows/prod-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml index 8787fee86..d2a2dc3d3 100644 --- a/.github/workflows/prod-release.yml +++ b/.github/workflows/prod-release.yml @@ -47,7 +47,6 @@ jobs: - name: npm ci run: cd focalboard/webapp; npm ci --no-optional - run: cd focalboard/mattermost-plugin/webapp && npm ci - name: Set up Go uses: actions/setup-go@v3