diff --git a/.forgejo/actions/sccache/action.yml b/.forgejo/actions/sccache/action.yml index b2441109..b5e5dcf4 100644 --- a/.forgejo/actions/sccache/action.yml +++ b/.forgejo/actions/sccache/action.yml @@ -2,12 +2,18 @@ name: sccache description: | Install sccache for caching builds in GitHub Actions. +inputs: + token: + description: 'A Github PAT' + required: false runs: using: composite steps: - name: Install sccache - uses: https://git.tomfos.tr/tom/sccache-action@v1 + uses: https://github.com/mozilla-actions/sccache-action@v0.0.9 + with: + token: ${{ inputs.token }} - name: Configure sccache uses: https://github.com/actions/github-script@v7 with: diff --git a/.forgejo/actions/setup-rust/action.yml b/.forgejo/actions/setup-rust/action.yml index a8736a75..091da8c2 100644 --- a/.forgejo/actions/setup-rust/action.yml +++ b/.forgejo/actions/setup-rust/action.yml @@ -88,9 +88,19 @@ runs: # Shared toolchain cache across all Rust versions key: toolchain-${{ steps.runner-os.outputs.slug }} + - name: Debug GitHub token availability + shell: bash + run: | + if [ -z "${{ inputs.github-token }}" ]; then + echo "⚠️ No GitHub token provided - sccache will use fallback download method" + else + echo "✅ GitHub token provided for sccache" + fi - name: Setup sccache - uses: https://git.tomfos.tr/tom/sccache-action@v1 + uses: https://github.com/mozilla-actions/sccache-action@v0.0.9 + with: + token: ${{ inputs.github-token }} - name: Cache build artifacts id: build-cache diff --git a/.forgejo/workflows/build-fedora.yml b/.forgejo/workflows/build-fedora.yml index f8983441..530c4083 100644 --- a/.forgejo/workflows/build-fedora.yml +++ b/.forgejo/workflows/build-fedora.yml @@ -68,7 +68,9 @@ jobs: rust-deps-fedora${{ steps.fedora.outputs.version }}- - name: Setup sccache - uses: https://git.tomfos.tr/tom/sccache-action@v1 + uses: https://github.com/mozilla-actions/sccache-action@v0.0.9 + with: + token: ${{ secrets.GH_PUBLIC_RO }} - name: Configure sccache environment run: | @@ -82,11 +84,14 @@ jobs: - name: Install base RPM tools run: | dnf install -y --setopt=keepcache=1 \ - fedora-packager \ - python3-pip \ + wget \ + rpm-build \ rpm-sign \ + rpmdevtools \ rpkg \ - wget + cargo-rpm-macros \ + systemd-rpm-macros \ + python3-pip - name: Setup build environment and build SRPM run: | diff --git a/flake.lock b/flake.lock index f1859b57..4c2bf9fb 100644 --- a/flake.lock +++ b/flake.lock @@ -513,6 +513,23 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1753385396, + "narHash": "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY=", + "ref": "10.4.fb", + "rev": "28d4b7276c16ed3e28af1bd96162d6442ce25923", + "revCount": 13318, + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/rocksdb" + }, + "original": { + "ref": "10.4.fb", + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/rocksdb" + } + }, "root": { "inputs": { "attic": "attic", @@ -522,7 +539,8 @@ "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "rocksdb": "rocksdb" } }, "rust-analyzer-src": { diff --git a/flake.nix b/flake.nix index b8ac6029..e65fcbda 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,10 @@ flake-utils.url = "github:numtide/flake-utils?ref=main"; nix-filter.url = "github:numtide/nix-filter?ref=main"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable"; + rocksdb = { + url = "git+https://forgejo.ellis.link/continuwuation/rocksdb?ref=10.4.fb"; + flake = false; + }; }; outputs = @@ -61,13 +65,7 @@ inherit (self) liburing; }).overrideAttrs (old: { - src = pkgsHost.fetchFromGitea { - domain = "forgejo.ellis.link"; - owner = "continuwuation"; - repo = "rocksdb"; - rev = "10.4.fb"; - sha256 = "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY="; - }; + src = inputs.rocksdb; version = "v10.4.fb"; cmakeFlags = pkgs.lib.subtractLists [