From a32bef65530d4c329cad8666ddbdbda297cd2722 Mon Sep 17 00:00:00 2001 From: Damien Ciabrini Date: Sun, 29 Dec 2024 19:17:56 +0100 Subject: [PATCH] Nightly version emudbg 0.2+202403192028-2 --- .github/workflows/build-bottles.yaml | 193 +++++++++++++++++++++++++++ Formula/emudbg.rb | 7 +- azure-pipelines.yml | 82 ------------ 3 files changed, 194 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/build-bottles.yaml delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/build-bottles.yaml b/.github/workflows/build-bottles.yaml new file mode 100644 index 0000000..37d0961 --- /dev/null +++ b/.github/workflows/build-bottles.yaml @@ -0,0 +1,193 @@ +name: Build and Test +on: + push: + branches: + - nightly/* +jobs: + current_os: + name: "Current macOS" + runs-on: macos-15 + env: + OS: '15' + BRANCH: ${{ github.ref }} + HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GH_TOKEN }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Bottle formula + run: | + .ci/setup-brew-environment.sh --update + .ci/bottle-formula.sh + git diff Formula/* | tee $(Build.ArtifactStagingDirectory)/git-bottle-sha.diff + + - name: Capture bottle and hashe for next job + uses: actions/upload-artifact@v2 + with: + name: bottles + path: | + git-bottle-sha.diff + *.bottle.json + *.bottle*.tar.gz + + previous_os: + name: "Previous macOS" + runs-on: macos-14 + env: + OS: '14' + BRANCH: ${{ github.ref }} + HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GH_TOKEN }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Retrieve previous bottle data + uses: actions/download-artifact@v2 + with: + name: bottles + + - name: Bottle formula + run: | + patch -p1 < git-bottle-sha.diff + .ci/setup-brew-environment.sh --update + .ci/bottle-formula.sh + + - name: Capture bottles and hashes for next job + uses: actions/upload-artifact@v2 + with: + name: bottles + path: | + git-bottle-sha.diff + *.bottle.json + *.bottle*.tar.gz + + +# win: +# name: "Windows native MSYS2" +# runs-on: windows-latest +# defaults: +# run: +# shell: msys2 {0} +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# fetch-depth: 0 + +# - name: Install MSYS2 +# uses: msys2/setup-msys2@v2 +# with: +# msystem: UCRT64 +# update: true +# install: +# git autoconf automake make +# mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-pkgconf + +# - name: Add ngdevkit repos +# run: | +# echo -e "[ngdevkit]\nSigLevel = Optional TrustAll\nServer = https://dciabrin.net/msys2-ngdevkit/\$arch" >> /etc/pacman.conf +# pacman -Sy + +# - name: Build +# run: ./.github/scripts/build-msys2.sh + +# macos: +# name: "macOS build" +# runs-on: macos-latest +# env: +# BUILD_HOST_PARAMS: "" +# PREFIX: "/usr/local" +# steps: +# - name: Checkout +# uses: actions/checkout@v4 + +# - name: Dependencies +# run: brew install autoconf automake pkg-config + +# - name: Build +# run: ./.github/scripts/build.sh + + +# name: +# trigger: +# - nightly/* + +# jobs: +# - job: current_macos +# timeoutInMinutes: 150 +# displayName: "Bottle for macOS 15 (Sequoia)" +# pool: +# vmImage: 'macos-15' +# steps: +# - script: | +# .ci/setup-brew-environment.sh --update +# .ci/bottle-formula.sh +# displayName: Bottle formula for macOS 15 +# env: +# OS: '15' +# BRANCH: $(Build.SourceBranch) +# HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN) +# - script: | +# cp *.bottle.json *.bottle*.tar.gz $(Build.ArtifactStagingDirectory)/ +# git diff Formula/* | tee $(Build.ArtifactStagingDirectory)/git-bottle-sha.diff +# displayName: Capture bottles and hashes for next job +# - publish: $(Build.ArtifactStagingDirectory) +# artifact: artifact_current_macos + +# - job: previous_macos +# timeoutInMinutes: 150 +# dependsOn: current_macos +# displayName: "Bottle for macOS 14 (Sonoma)" +# pool: +# vmImage: 'macos-14' +# steps: +# - download: current +# artifact: artifact_current_macos +# - script: | +# patch -p1 < $(Pipeline.Workspace)/artifact_current_macos/git-bottle-sha.diff +# displayName: Retrieve hashes from previous job +# - script: | +# .ci/setup-brew-environment.sh --update +# .ci/bottle-formula.sh +# displayName: Bottle formula for macOS 14 +# env: +# OS: '14' +# BRANCH: $(Build.SourceBranch) +# HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN) +# - script: | +# cp $(Pipeline.Workspace)/artifact_current_macos/*.bottle.* $PWD/ +# cp *.bottle.json *.bottle*.tar.gz $(Build.ArtifactStagingDirectory)/ +# git diff Formula/* | tee $(Build.ArtifactStagingDirectory)/git-bottle-sha.diff +# displayName: Capture bottles and hashes for next job +# - publish: $(Build.ArtifactStagingDirectory) +# artifact: artifact_previous_macos + +# # - job: publish +# # dependsOn: previous_macos +# # displayName: "Publish new version and bottles" +# # pool: +# # vmImage: 'macOS-15' +# # steps: +# # - checkout: self +# # persistCredentials: true +# # - download: current +# # artifact: artifact_previous_macos +# # - script: | +# # cp $(Pipeline.Workspace)/artifact_previous_macos/*.bottle.* $PWD/ +# # patch -p1 < $(Pipeline.Workspace)/artifact_previous_macos/git-bottle-sha.diff +# # displayName: Retrieve bottles and hashes from previous job +# # # Publishing the new version prior to the bottles, because +# # # the bottle are bundled in a github archive which comes +# # # with a new tag in the git repo. So all the patches must be +# # # prior to the bottles. +# # # Until bottles are published, there's a small time window +# # # where 'brew install ' won't find bottles and rebuild +# # # from source. The inconvenience is assumed to be minimal. +# # - script: | +# # .ci/setup-brew-environment.sh +# # .ci/publish-new-formula-version.sh +# # .ci/publish-new-formula-bottles.sh +# # displayName: Pubish Formula version and bottles +# # env: +# # BRANCH: $(Build.SourceBranch) +# # HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN) diff --git a/Formula/emudbg.rb b/Formula/emudbg.rb index bc46010..023f6ea 100644 --- a/Formula/emudbg.rb +++ b/Formula/emudbg.rb @@ -2,14 +2,9 @@ class Emudbg < Formula desc "Emulator-agnostic source-level debugging API" homepage "https://github.com/dciabrin/emudbg" url "https://github.com/dciabrin/emudbg/archive/refs/tags/nightly-202403192028.tar.gz" - version "0.2+202403192028-1" + version "0.2+202403192028-2" sha256 "56306dd13bebcf001bcf340695b05d225bf077fc9ef99283db8f46eaf019e536" - bottle do - root_url "https://github.com/dciabrin/homebrew-ngdevkit/releases/download/emudbg-0.2+202403192028-1" - sha256 cellar: :any_skip_relocation, monterey: "34be83e2846c598370ee3d145bf24f180d939945df02d13f59db0c0d427ef3d6" - end - depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index f52d6f9..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,82 +0,0 @@ -trigger: -- nightly/* - -jobs: - - job: monterey - timeoutInMinutes: 150 - displayName: "Bottle for macOS 12 (Monterey)" - pool: - vmImage: 'macOS-12' - steps: - - script: | - .ci/setup-brew-environment.sh --update - .ci/bottle-formula.sh - displayName: Bottle formula on 12 - env: - OS: '12' - BRANCH: $(Build.SourceBranch) - HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN) - - script: | - cp *.bottle.json *.bottle*.tar.gz $(Build.ArtifactStagingDirectory)/ - git diff Formula/* | tee $(Build.ArtifactStagingDirectory)/git-bottle-sha.diff - displayName: Capture bottles and hashes for next job - - publish: $(Build.ArtifactStagingDirectory) - artifact: post_monterey - - - job: bigsur - timeoutInMinutes: 150 - dependsOn: monterey - displayName: "Bottle for macOS 11 (Big Sur)" - pool: - vmImage: 'macOS-11' - steps: - - download: current - artifact: post_monterey - - script: | - patch -p1 < $(Pipeline.Workspace)/post_monterey/git-bottle-sha.diff - displayName: Retrieve hashes from previous job - - script: | - .ci/setup-brew-environment.sh --update - .ci/bottle-formula.sh - displayName: Bottle formula on 11 - env: - OS: '11' - BRANCH: $(Build.SourceBranch) - HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN) - - script: | - cp $(Pipeline.Workspace)/post_monterey/*.bottle.* $PWD/ - cp *.bottle.json *.bottle*.tar.gz $(Build.ArtifactStagingDirectory)/ - git diff Formula/* | tee $(Build.ArtifactStagingDirectory)/git-bottle-sha.diff - displayName: Capture bottles and hashes for next job - - publish: $(Build.ArtifactStagingDirectory) - artifact: post_bigsur - - - job: publish - dependsOn: bigsur - displayName: "Publish new version and bottles" - pool: - vmImage: 'macOS-12' - steps: - - checkout: self - persistCredentials: true - - download: current - artifact: post_bigsur - - script: | - cp $(Pipeline.Workspace)/post_bigsur/*.bottle.* $PWD/ - patch -p1 < $(Pipeline.Workspace)/post_bigsur/git-bottle-sha.diff - displayName: Retrieve bottles and hashes from previous job - # Publishing the new version prior to the bottles, because - # the bottle are bundled in a github archive which comes - # with a new tag in the git repo. So all the patches must be - # prior to the bottles. - # Until bottles are published, there's a small time window - # where 'brew install ' won't find bottles and rebuild - # from source. The inconvenience is assumed to be minimal. - - script: | - .ci/setup-brew-environment.sh - .ci/publish-new-formula-version.sh - .ci/publish-new-formula-bottles.sh - displayName: Pubish Formula version and bottles - env: - BRANCH: $(Build.SourceBranch) - HOMEBREW_GITHUB_API_TOKEN: $(HOMEBREW_GITHUB_API_TOKEN)