Skip to content

Commit

Permalink
Updates from .real/homebrew-core 20220907.133855
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Ho committed Sep 7, 2022
1 parent 88d5828 commit 299c54e
Show file tree
Hide file tree
Showing 3,402 changed files with 28,125 additions and 46,739 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 5 additions & 6 deletions .github/workflows/autobump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
required: false
schedule:
# Every day at 5am
- cron: "0 5 * * *"
- cron: '0 5 * * *'

env:
HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1
Expand Down Expand Up @@ -601,6 +601,7 @@ env:
pmd
pngquant
pnpm
pocsuite3
podman
postgis
powerman
Expand Down Expand Up @@ -762,6 +763,7 @@ env:
trafficserver
tree-sitter
triangle
trino
trivy
trojan-go
typedb
Expand Down Expand Up @@ -839,15 +841,12 @@ env:
zstd
zydis
permissions:
contents: read

jobs:
autobump:
if: github.repository == 'Homebrew/homebrew-core'
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
container:
image: ghcr.io/homebrew/ubuntu22.04:master
image: ghcr.io/homebrew/ubuntu16.04:master
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/autopublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ concurrency:
env:
HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1

permissions:
contents: read

jobs:
autopublish:
if: github.repository == 'Homebrew/homebrew-core'
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
50 changes: 17 additions & 33 deletions .github/workflows/dispatch-build-bottle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ on:
upload:
description: "Whether to upload built bottles or not (default: false)"
required: false
wheezy:
description: Whether to build the bottle in Debian Wheezy container
required: false

env:
HOMEBREW_DEVELOPER: 1
HOMEBREW_GITHUB_ACTIONS: 1
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_CHANGE_ARCH_TO_ARM: 1

permissions:
contents: read

jobs:
prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
runners: ${{steps.runner-matrix.outputs.result}}
steps:
Expand All @@ -40,17 +40,9 @@ jobs:
uses: actions/github-script@v6
with:
script: |
const intelMacOSRegex = /^\d+(?:\.\d+)?$/;
return context.payload.inputs.runner.split(",")
.map(s => s.trim())
.filter(Boolean)
.map(s => {
if (intelMacOSRegex.test(s)) // Ephemeral runners
return `${s}-${context.runId}-${process.env.GITHUB_RUN_ATTEMPT}`
else
return s
});
.filter(Boolean);
bottle:
needs: prepare
strategy:
Expand All @@ -74,11 +66,14 @@ jobs:
echo timeout=${{github.event.inputs.timeout}}
echo issue=${{github.event.inputs.issue}}
echo upload=${{github.event.inputs.upload}}
echo wheezy=${{github.event.inputs.wheezy}}
- name: Set environment variables
if: runner.os == 'macOS'
run: |
echo 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' >> $GITHUB_ENV
# TODO: remove the line below once set in the runner .env file
echo 'GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED=1' >> $GITHUB_ENV
- name: Run Docker container
if: runner.os == 'Linux'
Expand All @@ -92,7 +87,7 @@ jobs:
--env-file <(env | egrep 'HOMEBREW|GITHUB') \
--workdir /tmp/bottles \
--pull always \
ghcr.io/homebrew/ubuntu22.04:master \
${{github.event.inputs.wheezy && 'homebrew/debian7:latest' || 'ghcr.io/homebrew/ubuntu16.04:master'}} \
sleep inf
# Fix working directory permissions
docker exec --user root ${{github.sha}} chmod 777 /tmp/bottles
Expand Down Expand Up @@ -134,27 +129,16 @@ jobs:

- name: Failures summary for brew test-bot --only-formulae
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/steps_output.txt
step_name: 'Build summary on ${{ matrix.runner }}'

- name: Output brew linkage result
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/linkage_output.txt
step_name: '`brew linkage` output on ${{ matrix.runner }}'
run: |
touch bottles/steps_output.txt
cat bottles/steps_output.txt
rm bottles/steps_output.txt
- name: Output brew bottle result
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/bottle_output.txt
step_name: '`brew bottle` output on ${{ matrix.runner }}'
run: |
cat bottles/bottle_output.txt
rm bottles/bottle_output.txt
- name: Upload logs
if: always()
Expand Down Expand Up @@ -221,7 +205,7 @@ jobs:
bot_body: ":x: Bottle request for ${{github.event.inputs.formula}} [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})."
bot: BrewTestBot
upload:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: bottle
if: github.event.inputs.upload
env:
Expand Down
38 changes: 10 additions & 28 deletions .github/workflows/dispatch-rebottle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ on:
description: "Whether to fail immediately on a single OS version failure (default: true)"
default: "true"
required: false

permissions:
contents: read

env:
HOMEBREW_DEVELOPER: 1
Expand All @@ -32,9 +29,9 @@ env:

jobs:
setup:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
container:
image: ghcr.io/homebrew/ubuntu22.04:master
image: ghcr.io/homebrew/ubuntu16.04:master
outputs:
runners: ${{steps.determine-runners.outputs.runners}}
steps:
Expand Down Expand Up @@ -95,27 +92,16 @@ jobs:
- name: Failures summary for brew test-bot --only-formulae
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/steps_output.txt
step_name: 'Build summary on ${{ matrix.runner }}'

- name: Output brew linkage result
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/linkage_output.txt
step_name: '`brew linkage` output on ${{ matrix.runner }}'
run: |
touch bottles/steps_output.txt
cat bottles/steps_output.txt
rm bottles/steps_output.txt
- name: Output brew bottle result
if: always()
uses: Homebrew/actions/failures-summary-and-bottle-result@master
with:
workdir: ${{matrix.workdir || github.workspace}}
result_path: bottles/bottle_output.txt
step_name: '`brew bottle` output on ${{ matrix.runner }}'
run: |
cat bottles/bottle_output.txt
rm bottles/bottle_output.txt
- name: Upload logs
if: failure()
Expand Down Expand Up @@ -164,11 +150,7 @@ jobs:
bot: BrewTestBot

upload:
permissions:
issues: write # for Homebrew/actions/post-comment
contents: write # for Homebrew/actions/git-try-push
packages: write # for brew pr-upload
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: bottle
if: github.event.inputs.upload
env:
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/publish-commit-bottles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ env:
HOMEBREW_DEVELOPER: 1
HOMEBREW_NO_AUTO_UPDATE: 1

permissions:
contents: read

jobs:
upload:
runs-on: ${{github.event.inputs.self_hosted == 'true' && 'linux-self-hosted-1' || 'ubuntu-22.04'}}
container: ${{github.event.inputs.self_hosted == 'true' && fromJson('{"image":"ghcr.io/homebrew/ubuntu22.04:master","options":"--user=linuxbrew -e GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"}') || ''}}
runs-on: ${{github.event.inputs.self_hosted == 'true' && 'linux-self-hosted-1' || 'ubuntu-latest'}}
container: ${{github.event.inputs.self_hosted == 'true' && fromJson('{"image":"ghcr.io/homebrew/ubuntu16.04:master","options":"--user=linuxbrew -e GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"}') || ''}}
steps:
- name: Post comment once started
uses: Homebrew/actions/post-comment@master
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/recreate-linux-runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ concurrency:
group: recreate-linux-runners
cancel-in-progress: true

permissions:
contents: read

jobs:
recreate:
if: github.repository == 'Homebrew/homebrew-core'
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
# TODO agree on one label for all runners
RUNNER_LABEL: TODO
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/remove-disabled-formulae.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ concurrency:
group: remove-disabled-formulae
cancel-in-progress: true

permissions:
contents: read

jobs:
remove-disabled-formulae:
if: startsWith(github.repository, 'Homebrew/')
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
Loading

0 comments on commit 299c54e

Please sign in to comment.