refactor: kind of everything #421
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [alias] | ||
| xtask = "run -p xtask --" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| name: "Rust toolchain (from rust-toolchain.toml)" | ||
| description: "Installs yq, reads rust-toolchain.toml, and installs that Rust toolchain via dtolnay/rust-toolchain." | ||
| inputs: | ||
| targets: | ||
| description: "Comma-separated Rust target triples to install" | ||
| required: false | ||
| default: "" | ||
| components: | ||
| description: "Comma-separated Rust components to install" | ||
| required: false | ||
| default: "" | ||
| outputs: | ||
| toolchain: | ||
| description: "Resolved toolchain channel" | ||
| value: ${{ steps.get_toolchain.outputs.toolchain }} | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Install yq (mikefarah) | ||
| shell: bash | ||
| run: | | ||
| set -euo pipefail | ||
|
|
||
| version="v4.50.1" | ||
|
|
||
| os="${RUNNER_OS}" # Linux|macOS|Windows | ||
| arch="${RUNNER_ARCH}" # X64|ARM64 | ||
|
|
||
| case "${os}" in | ||
| Linux) platform="linux"; ext="" ;; | ||
| macOS) platform="darwin"; ext="" ;; | ||
| Windows) platform="windows"; ext=".exe" ;; | ||
| *) echo "Unsupported runner OS: ${os}" >&2; exit 1 ;; | ||
| esac | ||
|
|
||
| case "${arch}" in | ||
| X64) cpu="amd64" ;; | ||
| ARM64) cpu="arm64" ;; | ||
| *) echo "Unsupported runner arch: ${arch}" >&2; exit 1 ;; | ||
| esac | ||
|
|
||
| url="https://github.com/mikefarah/yq/releases/download/${version}/yq_${platform}_${cpu}${ext}" | ||
|
|
||
| install_dir="${RUNNER_TEMP}/yq" | ||
| mkdir -p "${install_dir}" | ||
| bin="${install_dir}/yq${ext}" | ||
|
|
||
| echo "Downloading ${url}" >&2 | ||
|
|
||
| if [[ "${os}" == "Windows" ]]; then | ||
| powershell -NoProfile -Command "Invoke-WebRequest -Uri '${url}' -OutFile '${bin}'" | ||
| else | ||
| curl -fsSL "${url}" -o "${bin}" | ||
| fi | ||
|
|
||
| if [[ "${os}" != "Windows" ]]; then | ||
| chmod +x "${bin}" | ||
| fi | ||
|
|
||
| echo "${install_dir}" >> "${GITHUB_PATH}" | ||
|
|
||
| "${bin}" --version | ||
| - name: Get toolchain from rust-toolchain.toml | ||
| id: get_toolchain | ||
| shell: bash | ||
| run: | | ||
| ext="" | ||
| if [[ "${RUNNER_OS}" == "Windows" ]]; then | ||
| ext=".exe" | ||
| fi | ||
| toolchain="$(${RUNNER_TEMP}/yq/yq${ext} -r '.toolchain.channel' rust-toolchain.toml)" | ||
| if [[ -z "${toolchain}" || "${toolchain}" == "null" ]]; then | ||
| echo "Could not determine toolchain from rust-toolchain.toml" >&2 | ||
| exit 1 | ||
| fi | ||
| echo "toolchain=${toolchain}" >> "${GITHUB_OUTPUT}" | ||
| - name: Install Rust toolchain | ||
| uses: dtolnay/rust-toolchain@f7ccc83f9ed1e5b9c81d8a67d7ad1a747e22a561 | ||
| with: | ||
| toolchain: ${{ steps.get_toolchain.outputs.toolchain }} | ||
| targets: ${{ inputs.targets }} | ||
| components: ${{ inputs.components }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| name: Build RustOwl | ||
| on: | ||
| push: | ||
| branches: ["main"] | ||
| workflow_dispatch: | ||
| workflow_call: | ||
| outputs: | ||
| run_id: | ||
| description: Run ID of this workflow | ||
| value: ${{ github.run_id }} | ||
| jobs: | ||
| rustowl: | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - os: ubuntu-24.04 | ||
| target: x86_64-unknown-linux-gnu | ||
| - os: ubuntu-24.04-arm | ||
| target: aarch64-unknown-linux-gnu | ||
| - os: macos-15 | ||
| target: aarch64-apple-darwin | ||
| - os: macos-15-intel | ||
| target: x86_64-apple-darwin | ||
| - os: windows-2022 | ||
| target: x86_64-pc-windows-msvc | ||
| - os: windows-11-arm | ||
| target: aarch64-pc-windows-msvc | ||
| runs-on: ${{ matrix.os }} | ||
| permissions: | ||
| contents: write | ||
| defaults: | ||
| run: | ||
| shell: bash | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 | ||
|
Owner
There was a problem hiding this comment. why is this pinned to specific version?
Owner
There was a problem hiding this comment. Security? I thought that specifying patch version results in missing security patch update...
Collaborator
Author
There was a problem hiding this comment. And if you do the old syntax, one can push anything and change tag and boom! @cordx56
Owner
There was a problem hiding this comment. Then, we should use version checking bot like dependabot.
Collaborator
Author
There was a problem hiding this comment. Thats already done @cordx56. Its just another layer so its kind of bullet proof.
Collaborator
Author
There was a problem hiding this comment. The vulnerability i mentioned, none can do nothing. Other than pinning the long hash (all big projects do this)
Collaborator
Author
There was a problem hiding this comment. Dependabot tracks tags, not anything else. So keeping tag same will silently pull new commits. This stops that. Dependabot will still update this (see the comment after some space? Thats the format) |
||
| with: | ||
| persist-credentials: false | ||
| # Using fat LTO causes failure to link on Windows ARM | ||
| - name: Set build profile | ||
| run: | | ||
|
|
@@ -44,56 +44,47 @@ jobs: | |
| else | ||
| echo "build_profile=release" >> $GITHUB_ENV | ||
| fi | ||
| # uname on Windows on ARM returns "x86_64" | ||
| - name: Set ARCH flag for Windows on ARM | ||
| if: matrix.os == 'windows-11-arm' | ||
| run: echo "TOOLCHAIN_ARCH=aarch64" >> $GITHUB_ENV | ||
| - name: setup env | ||
| run: | | ||
| toolchain="$(cargo xtask toolchain sh -lc 'echo $RUSTOWL_TOOLCHAIN')" | ||
| echo "toolchain=$toolchain" >> $GITHUB_ENV | ||
|
|
||
| ([[ "${{ matrix.target }}" == *msvc* ]] && echo "exec_ext=.exe" || echo "exec_ext=") >> $GITHUB_ENV | ||
| ([[ "${{ matrix.target }}" == *windows* ]] && echo "is_windows=true" || echo "is_windows=false") >> $GITHUB_ENV | ||
| ([[ "${{ matrix.target }}" == *linux* ]] && echo "is_linux=true" || echo "is_linux=false") >> $GITHUB_ENV | ||
| - name: Install zig | ||
| if: ${{ env.is_linux == 'true' }} | ||
| uses: mlugg/setup-zig@e7d1537c378b83b8049f65dda471d87a2f7b2df2 # v2.2.0 | ||
| with: | ||
| version: 0.13.0 | ||
| - name: Build | ||
| run: | | ||
| if [[ "${{ env.is_linux }}" == "true" ]]; then | ||
| cargo xtask toolchain cargo install --locked cargo-zigbuild | ||
| cargo xtask toolchain cargo zigbuild --target ${{ matrix.target }}.2.17 --profile=${{ env.build_profile }} | ||
| else | ||
| cargo xtask toolchain cargo build --target ${{ matrix.target }} --profile=${{ env.build_profile }} | ||
| fi | ||
| - name: Check the functionality | ||
| run: | | ||
| ./target/${{ matrix.target }}/${{ env.build_profile }}/rustowl${{ env.exec_ext }} check ./perf-tests/dummy-package | ||
| - name: Set archive name | ||
| run: | | ||
| if [[ "${{ env.is_windows }}" == "true" ]]; then | ||
| echo "archive_name=rustowl-${{ matrix.target }}.zip" >> $GITHUB_ENV | ||
| else | ||
| echo "archive_name=rustowl-${{ matrix.target }}.tar.gz" >> $GITHUB_ENV | ||
| fi | ||
| - name: Setup archive artifacts | ||
| run: | | ||
| rm -rf rustowl && mkdir -p rustowl/sysroot/${{ env.toolchain }}/bin | ||
|
|
||
| cp target/${{ matrix.target }}/${{ env.build_profile }}/rustowl${{ env.exec_ext }} ./rustowl/ | ||
| cp target/${{ matrix.target }}/${{ env.build_profile }}/rustowlc${{ env.exec_ext }} ./rustowl/sysroot/${{ env.toolchain }}/bin | ||
|
|
||
| cp README.md ./rustowl | ||
| cp LICENSE ./rustowl | ||
|
|
@@ -112,44 +103,38 @@ jobs: | |
| cd .. | ||
| fi | ||
|
|
||
| cp ./rustowl/rustowl${{ env.exec_ext }} ./rustowl-${{ matrix.target }}${{ env.exec_ext }} | ||
| - name: Upload | ||
| uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0 | ||
| with: | ||
| name: rustowl-runtime-${{ matrix.target }} | ||
| path: | | ||
| rustowl-${{ matrix.target }}${{ env.exec_ext }} | ||
| ${{ env.archive_name }} | ||
| vscode: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 | ||
| with: | ||
| persist-credentials: false | ||
| - name: Setup Node.js | ||
| uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 | ||
| with: | ||
| node-version: 20 | ||
| - name: Setup PNPM And Install dependencies | ||
| uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0 | ||
| with: | ||
| package_json_file: ./vscode/package.json | ||
| run_install: | | ||
| - cwd: ./vscode | ||
| - name: Create VSIX | ||
| run: pnpm build | ||
| working-directory: ./vscode | ||
| - name: Upload | ||
| uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0 | ||
| with: | ||
| name: rustowl-vscode | ||
| path: vscode/**/*.vsix | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.