1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-07 20:39:59 +02:00

chore: [no-lint] Fix action runners for blacksmith, b=no-bug, c=workflows

This commit is contained in:
Mr. M 2025-06-20 14:13:23 +02:00
parent 8bc4c97215
commit 5040df2416
No known key found for this signature in database
GPG key ID: 6292C4C8F8652B18
4 changed files with 38 additions and 55 deletions

View file

@ -50,10 +50,24 @@ on:
default: false default: false
jobs: jobs:
debug-inputs: buildid:
name: Debug inputs name: Generate build ID
runs-on: blacksmith-2vcpu-ubuntu-2404 runs-on: ubuntu-latest
outputs:
buildids: ${{ steps.get.outputs.bid }}
steps: steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.DEPLOY_KEY }}
- id: get
shell: bash -xe {0}
run: |
bdat=`date +"%Y%m%d%I%M%S"`
echo "bid=${bdat}" >> $GITHUB_OUTPUT
- name: Debug - name: Debug
run: | run: |
echo "create_release: ${{ inputs.create_release }}" echo "create_release: ${{ inputs.create_release }}"
@ -64,21 +78,28 @@ jobs:
echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}" echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}" echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
buildid: - name: Check if correct branch
name: Generate build ID if: ${{ inputs.create_release }}
runs-on: blacksmith-2vcpu-ubuntu-2404
outputs:
buildids: ${{ steps.get.outputs.bid }}
steps:
- id: get
shell: bash -xe {0}
run: | run: |
bdat=`date +"%Y%m%d%I%M%S"` echo "Checking if we are on the correct branch"
echo "bid=${bdat}" >> $GITHUB_OUTPUT git branch
git status
git branch --show-current
branch="${{ inputs.update_branch }}"
if [[ $branch == "twilight" ]]; then
branch="dev"
elif [[ $branch == "release" ]]; then
branch="stable"
fi
if [[ $(git branch --show-current) != $branch ]]; then
echo ">>> Branch mismatch"
# exit 1
else
echo ">>> Branch matches"
fi
start-self-host: start-self-host:
runs-on: blacksmith-2vcpu-ubuntu-2404 runs-on: ubuntu-latest
needs: debug-inputs
steps: steps:
- name: Download aws-cli - name: Download aws-cli
if: ${{ inputs.create_release && inputs.update_branch == 'release' }} if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
@ -101,42 +122,12 @@ jobs:
echo "Removing self-hosted runner script" echo "Removing self-hosted runner script"
rm start.sh || true rm start.sh || true
check-build-is-correct:
runs-on: blacksmith-2vcpu-ubuntu-2404
needs: [debug-inputs]
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.DEPLOY_KEY }}
- name: Check if correct branch
if: ${{ inputs.create_release }}
run: |
echo "Checking if we are on the correct branch"
git branch
git status
git branch --show-current
branch="${{ inputs.update_branch }}"
if [[ $branch == "twilight" ]]; then
branch="dev"
elif [[ $branch == "release" ]]; then
branch="stable"
fi
if [[ $(git branch --show-current) != $branch ]]; then
echo ">>> Branch mismatch"
# exit 1
else
echo ">>> Branch matches"
fi
build-data: build-data:
permissions: permissions:
contents: write contents: write
name: Generate build data name: Generate build data
runs-on: blacksmith-2vcpu-ubuntu-2404 runs-on: blacksmith-2vcpu-ubuntu-2404
needs: check-build-is-correct needs: buildid
outputs: outputs:
build_date: ${{ steps.data.outputs.builddate }} build_date: ${{ steps.data.outputs.builddate }}
version: ${{ steps.data.outputs.version }} version: ${{ steps.data.outputs.version }}

View file

@ -4,7 +4,6 @@ on:
push: push:
branches: branches:
- dev - dev
workflow_dispatch:
workflow_call: workflow_call:
pull_request: pull_request:
branches: branches:
@ -16,6 +15,7 @@ permissions:
jobs: jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ !contains(github.event.head_commit.message, '[no-lint]') }}
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4

View file

@ -44,10 +44,6 @@ jobs:
with: with:
tool-cache: false tool-cache: false
# Bug: https://github.com/actions/checkout/issues/1153
- name: Remove zombie lock file
run: rm -f /home/ubuntu/actions-runner/_work/desktop/desktop/.git/modules/l10n/index.lock
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:

View file

@ -53,10 +53,6 @@ jobs:
with: with:
tool-cache: false tool-cache: false
# Bug: https://github.com/actions/checkout/issues/1153
- name: Remove zombie lock file
run: rm -f /home/ubuntu/actions-runner/_work/desktop/desktop/.git/modules/l10n/index.lock
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with: