Skip to content

Commit

Permalink
new config for github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Ponchale committed Aug 22, 2024
1 parent 9a91cd3 commit 6729300
Show file tree
Hide file tree
Showing 14 changed files with 345 additions and 198 deletions.
133 changes: 133 additions & 0 deletions .cargo/config.toml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# This file contains vendoring instructions for cargo.
# It was generated by `mach vendor rust`.
# Please do not edit.

[source.crates-io]
replace-with = "vendored-sources"

[source."git+https://github.com/FirefoxGraphics/aa-stroke?rev=d94278ed9c7020f50232689a26d1277eb0eb74d2"]
git = "https://github.com/FirefoxGraphics/aa-stroke"
rev = "d94278ed9c7020f50232689a26d1277eb0eb74d2"
replace-with = "vendored-sources"

[source."git+https://github.com/FirefoxGraphics/wpf-gpu-raster?rev=99979da091fd58fba8477e7fcdf5ec0727102916"]
git = "https://github.com/FirefoxGraphics/wpf-gpu-raster"
rev = "99979da091fd58fba8477e7fcdf5ec0727102916"
replace-with = "vendored-sources"

[source."git+https://github.com/chris-zen/coremidi.git?rev=fc68464b5445caf111e41f643a2e69ccce0b4f83"]
git = "https://github.com/chris-zen/coremidi.git"
rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83"
replace-with = "vendored-sources"

[source."git+https://github.com/franziskuskiefer/cose-rust?rev=43c22248d136c8b38fe42ea709d08da6355cf04b"]
git = "https://github.com/franziskuskiefer/cose-rust"
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
replace-with = "vendored-sources"

[source."git+https://github.com/gfx-rs/wgpu?rev=c7458638d14921c7562e4197ddeefa17be413587"]
git = "https://github.com/gfx-rs/wgpu"
rev = "c7458638d14921c7562e4197ddeefa17be413587"
replace-with = "vendored-sources"

[source."git+https://github.com/glandium/mio?rev=9a2ef335c366044ffe73b1c4acabe50a1daefe05"]
git = "https://github.com/glandium/mio"
rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05"
replace-with = "vendored-sources"

[source."git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80"]
git = "https://github.com/hsivonen/any_all_workaround"
rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80"
replace-with = "vendored-sources"

[source."git+https://github.com/hsivonen/chardetng?rev=3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"]
git = "https://github.com/hsivonen/chardetng"
rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"
replace-with = "vendored-sources"

[source."git+https://github.com/hsivonen/chardetng_c?rev=ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"]
git = "https://github.com/hsivonen/chardetng_c"
rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
replace-with = "vendored-sources"

[source."git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01"]
git = "https://github.com/jfkthame/mapped_hyph.git"
rev = "c7651a0cffff41996ad13c44f689bd9cd2192c01"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla-spidermonkey/jsparagus?rev=61f399c53a641ebd3077c1f39f054f6d396a633c"]
git = "https://github.com/mozilla-spidermonkey/jsparagus"
rev = "61f399c53a641ebd3077c1f39f054f6d396a633c"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/application-services?rev=7c275b9088557abcbc8f3c2834f9aaa9064ca5e4"]
git = "https://github.com/mozilla/application-services"
rev = "7c275b9088557abcbc8f3c2834f9aaa9064ca5e4"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/audioipc?rev=3495905752a4263827f5d43737f9ca3ed0243ce0"]
git = "https://github.com/mozilla/audioipc"
rev = "3495905752a4263827f5d43737f9ca3ed0243ce0"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/cubeb-coreaudio-rs?rev=8bce3b333a920999055397a397e59c2b81a93b9a"]
git = "https://github.com/mozilla/cubeb-coreaudio-rs"
rev = "8bce3b333a920999055397a397e59c2b81a93b9a"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/cubeb-pulse-rs?rev=8678dcab1c287de79c4c184ccc2e065bc62b70e2"]
git = "https://github.com/mozilla/cubeb-pulse-rs"
rev = "8678dcab1c287de79c4c184ccc2e065bc62b70e2"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/midir.git?rev=85156e360a37d851734118104619f86bd18e94c6"]
git = "https://github.com/mozilla/midir.git"
rev = "85156e360a37d851734118104619f86bd18e94c6"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/mp4parse-rust?rev=a138e40ec1c603615873e524b5b22e11c0ec4820"]
git = "https://github.com/mozilla/mp4parse-rust"
rev = "a138e40ec1c603615873e524b5b22e11c0ec4820"
replace-with = "vendored-sources"

[source."git+https://github.com/mozilla/neqo?tag=v0.7.9"]
git = "https://github.com/mozilla/neqo"
tag = "v0.7.9"
replace-with = "vendored-sources"

[source."git+https://github.com/seanmonstar/warp?rev=9d081461ae1167eb321585ce424f4fef6cf0092b"]
git = "https://github.com/seanmonstar/warp"
rev = "9d081461ae1167eb321585ce424f4fef6cf0092b"
replace-with = "vendored-sources"

[source."git+https://github.com/servo/unicode-bidi?rev=ca612daf1c08c53abe07327cb3e6ef6e0a760f0c"]
git = "https://github.com/servo/unicode-bidi"
rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c"
replace-with = "vendored-sources"

[source."git+https://github.com/zakarumych/gpu-descriptor?rev=7b71a4e47c81903ad75e2c53deb5ab1310f6ff4d"]
git = "https://github.com/zakarumych/gpu-descriptor"
rev = "7b71a4e47c81903ad75e2c53deb5ab1310f6ff4d"
replace-with = "vendored-sources"


# Take advantage of the fact that cargo will treat lines starting with #
# as comments to add preprocessing directives. This file can thus by copied
# as-is to $topsrcdir/.cargo/config.toml with no preprocessing to be used there
# (for e.g. independent tasks building rust code), or be preprocessed by
# the build system to produce a .cargo/config.toml with the right content.
#define REPLACE_NAME vendored-sources
#define VENDORED_DIRECTORY third_party/rust
# We explicitly exclude the following section when preprocessing because
# it would overlap with the preprocessed [source."@REPLACE_NAME@"], and
# cargo would fail.
#ifndef REPLACE_NAME
[source.vendored-sources]
directory = "third_party/rust"
#endif

# Thankfully, @REPLACE_NAME@ is unlikely to be a legitimate source, so
# cargo will ignore it when it's here verbatim.
#filter substitution
[source."@REPLACE_NAME@"]
directory = "@top_srcdir@/@VENDORED_DIRECTORY@"
4 changes: 2 additions & 2 deletions .github/workflows/auto-labeler-to-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# Please write our copyright if you use this file.
# © 2023 Midori Projects & Contributors
# © 2023 Floorp Projects & Contributors

name: Auto Label for Issues

Expand All @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label new issue or discussion
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const issueNumber = context.payload.issue.number;
Expand Down
40 changes: 27 additions & 13 deletions .github/workflows/daily-build-with-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
outputs:
display-version: ${{ steps.get.outputs.display-version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
sparse-checkout: 'browser/config/version_display.txt'
- name: Get Display Version
Expand All @@ -40,7 +40,7 @@ jobs:
outputs:
inside-version: ${{ steps.get.outputs.inside-version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
sparse-checkout: 'browser/config/version.txt'
- name: Get Inside Version
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
arch: x86_64

Part3-win-x86_64-build-with-profdata-and-jarlog:
needs: [Part2-win-x86_64-gen-profdata-and-jarlog ,get-buildid]
needs: [Part2-win-x86_64-gen-profdata-and-jarlog, get-buildid]
uses: ./.github/workflows/windows-build.yml
with:
aarch64: false
Expand All @@ -89,7 +89,7 @@ jobs:
MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}}

Part4-win-x86_64-gen-update-xml:
needs: [get-display-version, get-buildid, get-inside-version,Part3-win-x86_64-build-with-profdata-and-jarlog]
needs: [get-display-version, get-buildid, get-inside-version, Part3-win-x86_64-build-with-profdata-and-jarlog]
runs-on: ubuntu-latest
steps:
- name: generate update XML file
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
MAR_SIZE: ${{needs.Part3-win-x86_64-build-with-profdata-and-jarlog.outputs.mar_size}}

- name: Publish 🎁
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: update-xml-midori-win-x86_64
path: |
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
MAR_NAME: ${{needs.Part1-build-linux-x86_64-PGO.outputs.mar_name}}
MAR_SIZE: ${{needs.Part1-build-linux-x86_64-PGO.outputs.mar_size}}
- name: Publish 🎁
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: update-xml-midori-linux-x86_64
path: |
Expand Down Expand Up @@ -234,31 +234,31 @@ jobs:
mkdir -p ~/downloads/artifacts/macOS-x64
- name: download Linux x86_64 build artifact 📥
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: midori-linux-x64
path: ~/downloads/artifacts/linux-x64

- name: download Linux x86_64 build artifact 📥
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: update-xml-midori-linux-x86_64
path: ~/downloads/artifacts/linux-x64

- name: download Windows x86_64 build artifact📥
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: please-use-this-midori-windows-x86_64-package-build-with-profdata-and-jarlog
path: ~/downloads/artifacts/windows-x64

- name: download Windows x86_64 update xml📥
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: update-xml-midori-win-x86_64
path: ~/downloads/artifacts/windows-x64

- name: download macOS Universal build artifact📥
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Universal-Artifact
path: ~/downloads/artifacts/macOS-x64
Expand All @@ -275,10 +275,23 @@ jobs:
run: |
cd ~/downloads/artifacts/linux-x64
mv midori-*.linux-x86_64.tar.bz2 midori-linux-x86_64.tar.bz2
- name: Create hashes.txt file 📝
run: |
cd /home/runner/downloads/artifacts
touch hashes.txt
echo "SHA256 hashes" > hashes.txt
echo "****************************************************************************************************" >> hashes.txt
echo "Windows x86_64" >> hashes.txt
sha256sum windows-x64/midori-win64.installer.exe >> hashes.txt
echo "****************************************************************************************************" >> hashes.txt
echo "Linux x86_64" >> hashes.txt
sha256sum linux-x64/midori-linux-x86_64.tar.bz2 >> hashes.txt
echo "****************************************************************************************************" >> hashes.txt
- name: Deploy to GitHub Releases 🚀
id: create_release
uses: "softprops/action-gh-release@v1"
uses: softprops/action-gh-release@v2
with:
files: |
/home/runner/downloads/artifacts/linux-x64/LINUX-x86_64.mar
Expand All @@ -290,6 +303,7 @@ jobs:
/home/runner/downloads/artifacts/windows-x64/WINNT-x86_64.xml
/home/runner/downloads/artifacts/linux-x64/LINUX-x86_64.xml
/home/runner/downloads/artifacts/macOS-x64/DARWIN-Universal.xml
/home/runner/downloads/artifacts/hashes.txt
tag_name: "beta"
name: "Midori beta build: v${{ needs.get-display-version.outputs.display-version }} | ${{ needs.get-buildid.outputs.buildids }}"
Expand All @@ -301,7 +315,7 @@ jobs:
prerelease: true
token: ${{ github.token }}
env:
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_REPOSITORY: ${{ github.repository }}

- name: Upload update.xml file to Ablaze server 📤
run: |
Expand Down
Loading

0 comments on commit 6729300

Please sign in to comment.