Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
tchoutri committed Jan 12, 2025
2 parents d9e08fe + 2433afe commit 6102ac8
Show file tree
Hide file tree
Showing 23 changed files with 21,892 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
generateMatrix:
name: "Generate matrix from cabal"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -21,7 +21,7 @@ jobs:
uses: kleidukos/get-tested@v0.1.7.1
with:
cabal-file: flora.cabal
ubuntu-version: "latest"
ubuntu-version: "22.04"
version: 0.1.7.1

Backend_tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- synchronize
jobs:
lint-changelog:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: "actions/checkout@v4"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Publish Docker Image

on:
on:
push:
branches: ["development"]
paths:
- Dockerfile
- Dockerfile
- docker-compose.yml
- scripts/.zshrc

jobs:
publish-hello-docker-image:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Login to GitHub Container Registry
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/duplicate-indexes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
generateMatrix:
name: "Generate matrix from cabal"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -21,7 +21,7 @@ jobs:
uses: kleidukos/get-tested@v0.1.7.1
with:
cabal-file: flora.cabal
ubuntu-version: "latest"
ubuntu-version: "22.04"
version: 0.1.7.1

duplicate-index-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
Frontend_tests:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
fourmolu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -20,7 +20,7 @@ jobs:
app/**/*.hs
hlint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/missing-fk-indexes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
generateMatrix:
name: "Generate matrix from cabal"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -21,7 +21,7 @@ jobs:
uses: kleidukos/get-tested@v0.1.7.1
with:
cabal-file: flora.cabal
ubuntu-version: "latest"
ubuntu-version: "22.04"
version: 0.1.7.1

missing-fk-index-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
sudo apt -y update
sudo apt -y install postgresql-14 g++ mcpp libffi7 llvm zlib1g-dev
sudo apt -y install postgresql-16 g++ mcpp libffi7 llvm zlib1g-dev

wget https://github.com/souffle-lang/souffle/releases/download/2.2/x86_64-ubuntu-2004-souffle-2.2-Linux.deb
sudo dpkg -i ./x86_64-ubuntu-2004-souffle-2.2-Linux.deb
6 changes: 3 additions & 3 deletions .github/workflows/test-docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Build Docker Image

on:
on:
pull_request:
branches: ["main", "development"]
paths:
- Dockerfile
- Dockerfile
- docker-compose.yml
- scripts/.zshrc

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Build the Docker image
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 1.0.24 -- 2025-01-12

- Do not wrongly include "Nothing" as a query param to dependents listing pages' URL [#817](https://github.com/flora-pm/flora-server/pull/817)
- Include prismJS to highlight code in the READMEs [#819](https://github.com/flora-pm/flora-server/pull/819)

## 1.0.23 -- 2025-01-02

- Record more route duration metrics with prometheus [#810](https://github.com/flora-pm/flora-server/pull/810)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ style-hs: ## Run the haskell code formatters (fourmolu, cabal-fmt)
@find app test src -name '*.hs' | xargs -P $(PROCS) -I {} fourmolu -q -i {}

style-css: ## Run the CSS code formatter (stylelint)
@cd assets ; yarn stylelint --fix css
@cd assets ; yarn stylelint --fix css --ignore-path .stylelintignore

style: style-hs style-css ## Run all the code formatters

Expand Down
1 change: 1 addition & 0 deletions assets/.stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
css/prism.css
144 changes: 144 additions & 0 deletions assets/css/prism.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
/* PrismJS 1.29.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+abap+abnf+actionscript+ada+agda+al+antlr4+apacheconf+apex+apl+applescript+aql+arduino+arff+armasm+arturo+asciidoc+aspnet+asm6502+asmatmel+autohotkey+autoit+avisynth+avro-idl+awk+bash+basic+batch+bbcode+bbj+bicep+birb+bison+bnf+bqn+brainfuck+brightscript+bro+bsl+c+csharp+cpp+cfscript+chaiscript+cil+cilkc+cilkcpp+clojure+cmake+cobol+coffeescript+concurnas+csp+cooklang+coq+crystal+css-extras+csv+cue+cypher+d+dart+dataweave+dax+dhall+diff+django+dns-zone-file+docker+dot+ebnf+editorconfig+eiffel+ejs+elixir+elm+etlua+erb+erlang+excel-formula+fsharp+factor+false+firestore-security-rules+flow+fortran+ftl+gml+gap+gcode+gdscript+gedcom+gettext+gherkin+git+glsl+gn+linker-script+go+go-module+gradle+graphql+groovy+haml+handlebars+haskell+haxe+hcl+hlsl+hoon+http+hpkp+hsts+ichigojam+icon+icu-message-format+idris+ignore+inform7+ini+io+j+java+javadoc+javadoclike+javastacktrace+jexl+jolie+jq+jsdoc+js-extras+json+json5+jsonp+jsstacktrace+js-templates+julia+keepalived+keyman+kotlin+kumir+kusto+latex+latte+less+lilypond+liquid+lisp+livescript+llvm+log+lolcode+lua+magma+makefile+markdown+markup-templating+mata+matlab+maxscript+mel+mermaid+metafont+mizar+mongodb+monkey+moonscript+n1ql+n4js+nand2tetris-hdl+naniscript+nasm+neon+nevod+nginx+nim+nix+nsis+objectivec+ocaml+odin+opencl+openqasm+oz+parigp+parser+pascal+pascaligo+psl+pcaxis+peoplecode+perl+php+phpdoc+php-extras+plant-uml+plsql+powerquery+powershell+processing+prolog+promql+properties+protobuf+pug+puppet+pure+purebasic+purescript+python+qsharp+q+qml+qore+r+racket+cshtml+jsx+tsx+reason+regex+rego+renpy+rescript+rest+rip+roboconf+robotframework+ruby+rust+sas+sass+scss+scala+scheme+shell-session+smali+smalltalk+smarty+sml+solidity+solution-file+soy+sparql+splunk-spl+sqf+sql+squirrel+stan+stata+iecst+stylus+supercollider+swift+systemd+t4-templating+t4-cs+t4-vb+tap+tcl+tt2+textile+toml+tremor+turtle+twig+typescript+typoscript+unrealscript+uorazor+uri+v+vala+vbnet+velocity+verilog+vhdl+vim+visual-basic+warpscript+wasm+web-idl+wgsl+wiki+wolfram+wren+xeora+xml-doc+xojo+xquery+yaml+yang+zig */

/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/

code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
font-size: 1em;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
tab-size: 4;
tab-size: 4;
tab-size: 4;
hyphens: none;
hyphens: none;
hyphens: none;
hyphens: none;
}

pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
code[class*="language-"]::selection, code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}

pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
code[class*="language-"]::selection, code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}

@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}

/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}

:not(pre) > code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}

/* Inline code */
:not(pre) > code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}

.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}

.token.punctuation {
color: #999;
}

.token.namespace {
opacity: .7;
}

.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}

.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}

.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;

/* This background color was intended by the author of this theme. */
background: hsl(0 0% 100% / 50%);
}

.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}

.token.function,
.token.class-name {
color: #DD4A68;
}

.token.regex,
.token.important,
.token.variable {
color: #e90;
}

.token.important,
.token.bold {
font-weight: bold;
}

.token.italic {
font-style: italic;
}

.token.entity {
cursor: help;
}

1 change: 1 addition & 0 deletions assets/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
@import "4-helpers/3-spacing.css";
@import "4-helpers/4-typography.css";
@import "4-helpers/5-state.css";
@import "prism.css";

/* Used for the sessions page */
.login-form {
Expand Down
4 changes: 3 additions & 1 deletion assets/esbuild.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const mkProdPlugins = () => {
console.log(assets);
const orderAssets = {
"app.js": assets.app.js,
"styles.css": assets[''].css[0]
"styles.css": assets[''].css[0],
"prism.js": assets.prism.js,
}
return JSON.stringify(orderAssets, null, " ");
}
Expand Down Expand Up @@ -70,6 +71,7 @@ const config = {
entryPoints: {
"app": "./js/app.js",
"styles": "./css/styles.css",
"prism": "./js/prism.js",
},
outdir: "../static",
bundle: true,
Expand Down
Loading

0 comments on commit 6102ac8

Please sign in to comment.