Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
Browse files Browse the repository at this point in the history
…to effectfully/bug/fix-isNormalType
  • Loading branch information
effectfully committed Jul 4, 2024
2 parents a143e4f + e5c0e76 commit 9acb41a
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 120 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/haddock-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
# https://intersectmbo.github.io/plutus/haddock/$version
# And optionally to:
# https://intersectmbo.github.io/plutus/haddock/latest
# On push to master, this workflows publishes to:
# https://intersectmbo.github.io/plutus/haddock/master

name: "📜 Haddock Site"

on:
push:
branches:
- master
workflow_dispatch:
inputs:
ref:
Expand Down Expand Up @@ -44,8 +49,13 @@ jobs:
- name: Checkout
uses: actions/checkout@main
with:
ref: ${{ inputs.ref }}
ref: ${{ inputs.ref || github.ref_name }}

- name: Checkout Haddock Script
run: |
git fetch origin master
git checkout origin/master ./scripts/combined-haddock.sh
- name: Build Site
run: |
nix develop --no-warn-dirty --accept-flake-config --command ./scripts/combined-haddock.sh _haddock all
Expand All @@ -54,7 +64,7 @@ jobs:
uses: JamesIves/github-pages-deploy-action@v4.6.1
with:
folder: _haddock
target-folder: haddock/${{ inputs.destination }}
target-folder: haddock/${{ inputs.destination || github.ref_name }}
single-commit: true

- name: Deploy Site (latest)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ on:
jobs:
Send:
runs-on: [ubuntu-latest]
# if: contains(fromJson('["success", "failure", "null", "skipped", "cancelled", "action_required", "neutral", "timed_out"]'), github.event.workflow_run.conclusion)
steps:
- name: Prepare Slack Message
uses: actions/github-script@main
Expand All @@ -29,10 +28,25 @@ jobs:
const name = "${{ github.event.workflow_run.name }}";
const url = "${{ github.event.workflow_run.html_url }}";
const status = "${{ github.event.workflow_run.status }}";
const action = "${{ github.event.action }}";
const conclusion = "${{ github.event.workflow_run.conclusion }}";
const message = `Workflow '${name}' \`${action}\`: \`${status}\`, \`${conclusion}\`, <${url}|View Logs>`;
console.log(message)
const failure_conclusions = [ "failure", "null", "cancelled", "action_required", "neutral", "timed_out" ];
let message = "";
if (conclusion == "") {
message = `${name} \`${status}\` ⏳ <${url}|View Logs>`;
}
else if (conclusion == "success") {
message = `${name} \`${conclusion}\` ✅ <${url}|View Logs>`;
}
else if (conclusion == "skipped") {
message = `${name} \`${conclusion}\` ⏩ <${url}|View Logs>`;
}
else if (failure_conclusions.includes(conclusion)) {
message = `${name} \`${conclusion}\` ❌ <${url}|View Logs> @channel`;
}
else {
message = `${name} \`${conclusion}\` ⁉️ <${url}|View Logs> Unknown Conclusion @channel`;
}
console.log(message);
core.setOutput("message", message);
- name: Notify Slack
Expand Down
7 changes: 6 additions & 1 deletion doc/docusaurus/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ const config: Config = {

// Set the production url of your site here
url: "https://intersectmbo.github.io",

// Set the /<baseUrl>/ pathname under which your site is served
// For GitHub pages deployment, it is often '/<projectName>/'
baseUrl: "/plutus/docs/",
// WARNING: normally this would be /plutus/docs/, because
// https://intersectmbo.github.io is a GitHub Pages URL.
// However we setup a redirect from intersectmbo.github.io/plutus
// to plutus.cardano.intersectmbo.org, so /docs/ is used here instead.
baseUrl: "/docs/",

// GitHub pages deployment config.
// If you aren't using GitHub pages, you don't need these.
Expand Down
2 changes: 1 addition & 1 deletion doc/docusaurus/src/components/CsvTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const CsvTable = ({

async function loadCode() {
// Fetch the raw csv from the file
const res = await fetch(`/plutus/master/docs/csv/${file}`);
const res = await fetch(`/docs/csv/${file}`);
const rawData = await res.text();

// If the component is unmounted, don't set the state
Expand Down
2 changes: 1 addition & 1 deletion doc/docusaurus/src/components/LiteralInclude.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const LiteralInclude = ({

async function loadCode() {
// Fetch the raw code from the file
const res = await fetch(`/plutus/master/docs/code/${file}`);
const res = await fetch(`/docs/code/${file}`);
const rawCode = await res.text();

// If the component is unmounted, don't set the state
Expand Down
Loading

0 comments on commit 9acb41a

Please sign in to comment.