Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Deprecate EC2 runners, bump LOK (#126)
Browse files Browse the repository at this point in the history
  • Loading branch information
chase authored Feb 21, 2024
2 parents 5c3b0bc + ba0a07d commit e404cfc
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 48 deletions.
38 changes: 0 additions & 38 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
8 changes: 0 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand All @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion src/electron/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/electron/ELECTRON_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.3.0-rc20
20.3.0-rc21

0 comments on commit e404cfc

Please sign in to comment.