Sulkta-OSS/agora
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #117 from Liqwid-Labs/connor/fix-ci

Browse source 
Fix ci doesn't run on `main` branch; reference to dependent repos normally
This commit is contained in:
Emily 2022-06-16 18:20:05 +02:00 • committed by GitHub
commit 014ef050d2
3 changed files with 1523 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/integrate.yaml vendored
View file

@ -7,7 +7,7 @@ on:
- "flake.lock" - "flake.lock"
- "agora.cabal" - "agora.cabal"
branches: branches:
- master - main
- staging - staging
pull_request: pull_request:
paths: paths:
@ -29,14 +29,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v2.4.0 - uses: actions/checkout@v2.4.0
- uses: webfactory/ssh-agent@v0.5.4
with:
ssh-private-key: |
${{ secrets.LIQWID_PLUTARCH_EXTRA_PRIVATE }}
${{ secrets.PLUTARCH_NUMERIC_PRIVATE }}
${{ secrets.PLUTARCH_SAFE_MONEY_PRIVATE }}
${{ secrets.PLUTARCH_CONTEXT_BUILDER_PRIVATE }}
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v16
name: Set up Nix and IOHK caches name: Set up Nix and IOHK caches
with: with:
@ -58,14 +50,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.4.0 - uses: actions/checkout@v2.4.0
- uses: webfactory/ssh-agent@v0.5.4
with:
ssh-private-key: |
${{ secrets.LIQWID_PLUTARCH_EXTRA_PRIVATE }}
${{ secrets.PLUTARCH_NUMERIC_PRIVATE }}
${{ secrets.PLUTARCH_SAFE_MONEY_PRIVATE }}
${{ secrets.PLUTARCH_CONTEXT_BUILDER_PRIVATE }}
- uses: cachix/install-nix-action@v16 - uses: cachix/install-nix-action@v16
name: Set up Nix and IOHK caches name: Set up Nix and IOHK caches
@ -88,7 +72,7 @@ jobs:
# which is set to automatically deploy to https://liqwid-labs.github.io/agora/. # which is set to automatically deploy to https://liqwid-labs.github.io/agora/.
- name: Publish Documentation - name: Publish Documentation
uses: peaceiris/actions-gh-pages@v3 uses: peaceiris/actions-gh-pages@v3
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/main'
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./result/agora/html publish_dir: ./result/agora/html

1897
flake.lock generated
View file

File diff suppressed because it is too large Load diff

8
flake.nix
View file

@ -17,17 +17,17 @@
"plutarch/haskell-nix/nixpkgs-unstable"; "plutarch/haskell-nix/nixpkgs-unstable";
inputs.liqwid-plutarch-extra.url = inputs.liqwid-plutarch-extra.url =
"git+ssh://git@github.com/Liqwid-Labs/liqwid-plutarch-extra?ref=main"; "github:Liqwid-Labs/liqwid-plutarch-extra?ref=main";
inputs.plutarch-numeric.url = inputs.plutarch-numeric.url =
"git+ssh://git@github.com/Liqwid-Labs/plutarch-numeric?ref=main"; "github:Liqwid-Labs/plutarch-numeric?ref=main";
inputs.plutarch-safe-money.url = inputs.plutarch-safe-money.url =
"git+ssh://git@github.com/Liqwid-Labs/plutarch-safe-money?ref=main"; "github:Liqwid-Labs/plutarch-safe-money?ref=main";
# Testing # Testing
inputs.plutarch-quickcheck.url = inputs.plutarch-quickcheck.url =
"github:liqwid-labs/plutarch-quickcheck?ref=staging"; "github:liqwid-labs/plutarch-quickcheck?ref=staging";
inputs.plutarch-context-builder.url = inputs.plutarch-context-builder.url =
"git+ssh://git@github.com/Liqwid-Labs/plutarch-context-builder?ref=main"; "github:Liqwid-Labs/plutarch-context-builder?ref=main";
outputs = inputs@{ self, nixpkgs, nixpkgs-latest, haskell-nix, plutarch, ... }: outputs = inputs@{ self, nixpkgs, nixpkgs-latest, haskell-nix, plutarch, ... }:
let let