From 3b00199f5f985b0cd17dfbe1b03106f9d6bf47a8 Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 11 Jan 2024 16:48:27 -0800 Subject: [PATCH] chore: rename docs config files to site --- .../{docs-deploy.yml => site-deploy.yml} | 2 +- .github/workflows/site-preview.yml | 39 ------------------- .github/workflows/site-prod.yml | 36 ----------------- flake.nix | 2 +- site/package-lock.json | 4 +- site/package.json | 2 +- site/{docs.nix => site.nix} | 2 +- 7 files changed, 6 insertions(+), 81 deletions(-) rename .github/workflows/{docs-deploy.yml => site-deploy.yml} (99%) delete mode 100644 .github/workflows/site-preview.yml delete mode 100644 .github/workflows/site-prod.yml rename site/{docs.nix => site.nix} (92%) diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/site-deploy.yml similarity index 99% rename from .github/workflows/docs-deploy.yml rename to .github/workflows/site-deploy.yml index 69bcc5a5e5..be721b29bc 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/site-deploy.yml @@ -1,4 +1,4 @@ -name: Deploy Docs +name: Deploy Site on: push: diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml deleted file mode 100644 index 3d65e59124..0000000000 --- a/.github/workflows/site-preview.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Site Preview - -on: - pull_request: - paths: - - 'site/**' - -env: - ARTIFACT_NAME: BUILD_LOG - NIX_VERSION: nix-2.14.1 - NIXPKGS_CHANNEL: nixos-22.11 - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true - -jobs: - preview: - # temporarily disable - if: ${{ false }} - runs-on: beefy-runner - outputs: - preview-url: ${{ steps.publish-preview.outputs.preview-url }} - permissions: write-all - steps: - - uses: actions/checkout@v3 - with: - lfs: true - - uses: cachix/install-nix-action@v20 - with: - nix_path: nixpkgs=channel:${{ env.NIXPKGS_CHANNEL }} - github_access_token: ${{ github.token }} - extra_nix_config: | - trusted-public-keys = union.cachix.org-1:TV9o8jexzNVbM1VNBOq9fu8NK+hL6ZhOyOh0quATy+M= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - substituters = https://union.cachix.org/ https://cache.nixos.org/ - - run: | - nix-channel --add https://nixos.org/channels/${{ env.NIXPKGS_CHANNEL }} nixpkgs - nix-channel --update - diff --git a/.github/workflows/site-prod.yml b/.github/workflows/site-prod.yml deleted file mode 100644 index 514c5a1a19..0000000000 --- a/.github/workflows/site-prod.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Deploy Site - -on: - push: - branches: - - main - -env: - ARTIFACT_NAME: BUILD_LOG - NIX_VERSION: nix-2.14.1 - NIXPKGS_CHANNEL: nixos-22.11 - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true - -jobs: - deploy: - # temporarily disable - if: ${{ false }} - runs-on: beefy-runner - permissions: write-all - steps: - - uses: actions/checkout@v3 - with: - lfs: true - - uses: cachix/install-nix-action@v20 - with: - nix_path: nixpkgs=channel:${{ env.NIXPKGS_CHANNEL }} - github_access_token: ${{ github.token }} - extra_nix_config: | - trusted-public-keys = union.cachix.org-1:TV9o8jexzNVbM1VNBOq9fu8NK+hL6ZhOyOh0quATy+M= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - substituters = https://union.cachix.org/ https://cache.nixos.org/ - - run: | - nix-channel --add https://nixos.org/channels/${{ env.NIXPKGS_CHANNEL }} nixpkgs - nix-channel --update diff --git a/flake.nix b/flake.nix index b71e2ff898..2cd8988ead 100644 --- a/flake.nix +++ b/flake.nix @@ -120,7 +120,7 @@ ./hubble/hubble.nix ./lib/ethereum-verifier/ethereum-verifier.nix ./uniond/proto.nix - ./site/docs.nix + ./site/site.nix ./light-clients/ethereum-light-client/ethereum-light-client.nix ./light-clients/cometbls-light-client/cometbls-light-client.nix ./lib/cometbls-groth16-verifier/default.nix diff --git a/site/package-lock.json b/site/package-lock.json index de1506a169..98d724da9b 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -1,11 +1,11 @@ { - "name": "docs", + "name": "union-site", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "docs", + "name": "union-site", "version": "0.0.1", "dependencies": { "@astrojs/svelte": "^5.0.3", diff --git a/site/package.json b/site/package.json index 5dca42fa5f..129b2c2c47 100644 --- a/site/package.json +++ b/site/package.json @@ -1,5 +1,5 @@ { - "name": "docs", + "name": "union-site", "version": "0.0.1", "type": "module", "scripts": { diff --git a/site/docs.nix b/site/site.nix similarity index 92% rename from site/docs.nix rename to site/site.nix index f99c02c2c2..349cad2b37 100644 --- a/site/docs.nix +++ b/site/site.nix @@ -6,7 +6,7 @@ { packages = { docs = pkgs.buildNpmPackage { - npmDepsHash = "sha256-XV9Qj5kt7flySJRfbjTIqLqQp/thBGQzW5+udv80p6g="; + npmDepsHash = "sha256-ehQzmf24fbLpB/m3vSvJoJiXL0HUEtCDI2xZGP1MUbU="; src = ./.; pname = "docs"; version = "0.0.1";