From 76fa977fe581aae911d690f4cd3322c0f9eac501 Mon Sep 17 00:00:00 2001
From: Chase Colman <chase@macro.com>
Date: Wed, 21 Feb 2024 20:35:38 +0800
Subject: [PATCH 1/2] Deprecate EC2 runners

---
 .github/workflows/build.yml   | 38 -----------------------------------
 .github/workflows/release.yml |  8 --------
 2 files changed, 46 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 878aad9..36d247c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,22 +19,7 @@ on:
         required: true
       instance_id:
         required: true
-
 jobs:
-  start_runner:
-    name: Start EC2 Runner
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup AWS
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.EC2_RUNNER_AWS_ID }}
-          aws-secret-access-key: ${{ secrets.EC2_RUNNER_AWS_SECRET }}
-          aws-region: us-east-1
-      - name: Start
-        run: aws ec2 start-instances --instance-ids ${{ secrets.instance_id }}
-      - name: Wait
-        run: aws ec2 wait instance-status-ok --instance-ids ${{ secrets.instance_id }}
   build:
     needs: [start_runner]
     continue-on-error: true # Required to stop the EC2 runner
@@ -268,26 +253,3 @@ jobs:
           body: |
             This is an automated release built from the `main` branch.
             For changes, please review the commit log.
-      - name: The job has succeeded
-        if: ${{ success() }}
-        id: check
-        run: echo "check=true" >> $GITHUB_OUTPUT
-  stop_runner:
-    name: Stop EC2 Runner
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup AWS-CLI
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.EC2_RUNNER_AWS_ID }}
-          aws-secret-access-key: ${{ secrets.EC2_RUNNER_AWS_SECRET }}
-          aws-region: us-east-1
-      - name: Stop Runner
-        run: aws ec2 stop-instances --instance-ids ${{ secrets.instance_id }}
-      - name: Wait for Runner to be stopped
-        run: aws ec2 wait instance-stopped --instance-ids ${{ secrets.instance_id }}
-      - name: Fail the workflow if test failed
-        if: ${{ needs.build.outputs.succeeded != 'true' }}
-        run: |
-          false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d44f16..4626882 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,10 +19,6 @@ jobs:
     uses: ./.github/workflows/fetch.yml
     with:
       runner_label: macro-linux
-    secrets:
-      EC2_RUNNER_AWS_ID: ${{ secrets.EC2_RUNNER_AWS_ID }}
-      EC2_RUNNER_AWS_SECRET: ${{ secrets.EC2_RUNNER_AWS_SECRET }}
-      instance_id: ${{ secrets.LINUX_RUNNER_INSTANCE_ID }}
   build_release:
     needs: [check_version, fetch]
     if: ${{ needs.check_version.outputs.should_run != 'false' }}
@@ -44,10 +40,6 @@ jobs:
       runner_label: ${{ matrix.os }}
       working_dir: ${{ matrix.working_dir }}
       version: ${{ needs.check_version.outputs.version }}
-    secrets:
-      EC2_RUNNER_AWS_ID: ${{ secrets.EC2_RUNNER_AWS_ID }}
-      EC2_RUNNER_AWS_SECRET: ${{ secrets.EC2_RUNNER_AWS_SECRET }}
-      instance_id: ${{ secrets[matrix.runner] }}
   build_release_mac:
     name: Build for Mac ${{ matrix.name }}
     if: ${{ needs.check_version.outputs.should_run != 'false' }}

From ba0a07d3f16406249c3f4e48b600153a8198b450 Mon Sep 17 00:00:00 2001
From: Chase Colman <chase@macro.com>
Date: Wed, 21 Feb 2024 20:37:21 +0800
Subject: [PATCH 2/2] LOK v0.6.20

---
 src/electron/DEPS             | 2 +-
 src/electron/ELECTRON_VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/electron/DEPS b/src/electron/DEPS
index ffa698f..fd7a675 100644
--- a/src/electron/DEPS
+++ b/src/electron/DEPS
@@ -11,7 +11,7 @@ vars = {
     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
 
   'pyyaml_version': '3.12',
-  'libreofficekit_version': 'v0.6.19',
+  'libreofficekit_version': 'v0.6.20',
 
   'chromium_git': 'https://chromium.googlesource.com',
   'electron_git': 'https://github.com/electron',
diff --git a/src/electron/ELECTRON_VERSION b/src/electron/ELECTRON_VERSION
index 6c3956e..fc11ee6 100644
--- a/src/electron/ELECTRON_VERSION
+++ b/src/electron/ELECTRON_VERSION
@@ -1 +1 @@
-20.3.0-rc20
+20.3.0-rc21