Skip to content

alex/fix analytics pixels #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 100 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
06ce4ab
Drive-by shooting down an unused import
andreasabel Feb 11, 2022
2ce66df
Commonmark: gfmExtensions needs to precede the defaultSyntaxSpec (#10…
andreasabel Feb 11, 2022
3df4784
Merge pull request #1003 from haskell/gfm-markdown
gbaz Feb 11, 2022
813bf16
Fix compilation with haddocks
ysangkok Feb 12, 2022
8afdffd
Re #1005: Restore haddock module header of RequestContentTypes
andreasabel Feb 13, 2022
ac4714d
Up CI to cabal 3.6, add haddock step
andreasabel Feb 13, 2022
d3989a7
README: cosmetics, formatting
andreasabel Feb 13, 2022
55a26c2
tests/Util: remove `die`
andreasabel Feb 13, 2022
5e3389e
Cosmetics: remove extra parentheses
andreasabel Feb 14, 2022
26e8a54
Fix whitespace: trailing spaces, trailing empty lines, tabs
andreasabel Feb 14, 2022
6553ea8
Configuration file for fix-whitespace
andreasabel Feb 14, 2022
74f992e
Dependency time-locale-compat can be eliminated since time >= 1.6
andreasabel Feb 14, 2022
9dcbc78
Remove #if-conditionals that predate GHC 7.10 and time-1.5
andreasabel Feb 14, 2022
03b611d
Removed unused import
andreasabel Feb 14, 2022
8443b80
Cosmetical fixes that help with doctest
andreasabel Feb 14, 2022
507e8e5
Suppress unused-record-wildcards warning (new in GHC 8.10)
andreasabel Feb 14, 2022
bc1f911
Include cabal.* in fix-whitespace check
andreasabel Feb 19, 2022
eadf543
Rearrange some definitions in preparation for GHC 9.0 Template Haskell
andreasabel Feb 19, 2022
41c8cb3
Fix parsing of ISO times
nickburlett Feb 11, 2022
4896b44
Update README for cabal configuration clarity
nickburlett Feb 20, 2022
dad14bb
Merge pull request #1020 from nickburlett/update-repository-readme
gbaz Feb 20, 2022
d179da8
Merge pull request #1018 from nickburlett/fix-upload-time-parse
gbaz Feb 21, 2022
95d8814
Unit tests for renderMarkdown in doctest format (#1000, #1001)
andreasabel Feb 14, 2022
5b2080f
Force .ghc.environment files so that doctests work with `cabal test`
andreasabel Feb 14, 2022
6c8689a
Move library code into subdirectory src/
andreasabel Feb 14, 2022
84d402a
Add new-browse on different endpoint
ysangkok Feb 13, 2022
d3ac12a
Make new-browse handle old endpoints
ysangkok Feb 21, 2022
8cfec3f
Adjust PaginationTest for pageSize=50
ysangkok Feb 21, 2022
a024bc8
Use flexbox instead of float
ysangkok Feb 22, 2022
3e8ba34
Use max-width instead of min-width for #left-pane
ysangkok Feb 22, 2022
417fe73
Scroll module list instead of breaking words
ysangkok Feb 22, 2022
d906734
Long module names push down properties box
ysangkok Feb 22, 2022
0ee9707
Width of #content varies, so #left-pane children also vary
ysangkok Feb 23, 2022
aae6abc
Add JSON endpoints for basic package information
imalsogreg Feb 20, 2019
7bfa6a2
Prettier/consistent margins in and around the form
ysangkok Feb 23, 2022
e8cf5ec
Merge pull request #996 from Kleidukos/api/package
gbaz Feb 24, 2022
ae3ae7f
update DataTables CSS and JS
peterbecich Feb 27, 2022
0512ce1
Doctest running via `doctest-parallel`
andreasabel Feb 14, 2022
d69f7b6
Simplify DocTestMain thanks to doctest-parallel-0.2.2
andreasabel Feb 27, 2022
3438b1f
Vendor ListT, removed in transformers-0.6 (Fix #1010) (#1027)
andreasabel Mar 13, 2022
9d4a490
GHC 9.0 migration: code rearragements (#1016)
andreasabel Mar 13, 2022
562dd90
Cabal 3.4: bump to Cabal-3.4, removed VersionRangeF cases (#1016)
andreasabel Mar 13, 2022
f5b9dcf
Cabal 3.4: copy D.S.Util.CabalRevisions from hackage-cli (#1016)
andreasabel Mar 13, 2022
b2f375a
Cabal 3.4: mainLibSet (new smart constructor) (#1016)
andreasabel Mar 13, 2022
74bfd7c
Cabal 3.4: Flag -> PackageFlag (#1016)
andreasabel Mar 13, 2022
cf6cf91
Cabal 3.4: need to import D.Types.ModuleReexport (#1016)
andreasabel Mar 13, 2022
5a8d37e
Cabal 3.4: KnownRepoType (reorganized data type) (#1016)
andreasabel Mar 13, 2022
1ec6fcf
Cabal 3.4: FieldGrammar (#1016)
andreasabel Mar 13, 2022
8a3d979
Cabal 3.4: CabalSpecVersion (#1016)
andreasabel Mar 13, 2022
973cdd8
CI: include GHC 9.0 (#1016)
andreasabel Mar 14, 2022
24edb7f
typo
Mar 14, 2022
6c53b70
typos
Mar 16, 2022
799b43c
Enable filtering packages by distro
ysangkok Mar 16, 2022
33d7a09
cleanup based on comments about outstanding work
gbaz Mar 24, 2022
428a823
Merge pull request #1022 from ysangkok/flex-box-properties
gbaz Mar 24, 2022
23626c2
Merge pull request #1025 from peterbecich/update-datatables
gbaz Mar 24, 2022
1543b15
Merge pull request #1031 from haskell/cabal-3.4
gbaz Mar 24, 2022
bf43964
Merge branch 'master' into js-browse-and-search
gbaz Mar 24, 2022
b6abd00
Rename 'new-browse' to 'browse', remove dead search explanation code
ysangkok Mar 25, 2022
5e5eaaa
Cosmetics: unobfuscate accumJPath
andreasabel Mar 27, 2022
8504271
Migrate to aeson-2.0
andreasabel Mar 27, 2022
c2cbecb
Minimal migration to Cabal-3.6.3.0
andreasabel Mar 27, 2022
c20269c
Merge branch 'master' into js-browse-and-search
gbaz Mar 27, 2022
7095333
Build with GHC 9.2
andreasabel Mar 28, 2022
ac439ee
PackageTestMain: comments, cosmetical changes
andreasabel Mar 28, 2022
4675d01
PackageTestMain: factor out successTest
andreasabel Mar 28, 2022
fa633f5
Fix #1030: test case
andreasabel Mar 28, 2022
9aed21b
aeson fix
gbaz Mar 28, 2022
e7570cc
Merge pull request #1038 from haskell/cabal-3.6
gbaz Mar 28, 2022
400d9af
Merge branch 'master' into js-browse-and-search
gbaz Mar 28, 2022
a22f92d
Merge pull request #1021 from ysangkok/js-browse-and-search
gbaz Mar 28, 2022
973096d
force no cache delay for tests
gbaz Mar 29, 2022
e82d635
Link build report from package page
ysangkok Mar 26, 2022
efe31ba
Merge pull request #1043 from ysangkok/link-build-report
gbaz Mar 30, 2022
d4b6d45
Simplify getting all package names and use `itemCache` in Browse (#1049)
ysangkok Apr 7, 2022
bb69286
Restore two-column layout for very wide viewports (#1050)
ysangkok Apr 7, 2022
9637bd4
Admins can view `/maintain` page (#1045)
ysangkok Apr 7, 2022
c3a876a
Small BuildClient fixes (#1044)
ysangkok Apr 7, 2022
73d008d
Helpful error message on missing group membership (#1054)
ysangkok Apr 11, 2022
e88e25a
Default to HTML handler, not the first (#1053)
ysangkok Apr 11, 2022
8ec64a1
Fix some hlint warnings (#1056)
jhrcek Apr 12, 2022
af11ace
Fix some hlint warnings - part 2 (#1057)
jhrcek Apr 15, 2022
71bc801
Add instructions for install native deps for Fedora
jhrcek Apr 16, 2022
10f2a90
Auto-generate more complete CI via haskell-ci (#1061)
andreasabel Apr 16, 2022
b4ea1c7
Fix incomplete-record-updates warnings (#1059)
jhrcek Apr 19, 2022
4a46d16
Use assert{Bool,Failure} from tasty-hunit
andreasabel Apr 25, 2022
1afb3cd
Add search/browse form for users without JavaScript (#1052)
ysangkok Apr 26, 2022
adc0344
Avoid top-level await, QuteBrowser compat (#1062)
ysangkok Apr 26, 2022
cf4ed45
Add form to update full name and email of user (#1047)
ysangkok May 14, 2022
0ba623b
Introduce analytics pixels infrastructure (#1042)
alexbiehl May 14, 2022
686676b
cleanup text from last pr
gbaz May 14, 2022
62804a3
comment out pixels until fixed
gbaz May 14, 2022
358d34f
update `nix-shell` sources; GitHub Actions for `nix-shell` (#1002)
peterbecich May 15, 2022
1c35e03
fix(server): email address validation (#1074)
tochicool May 15, 2022
2d4f3f7
delete unused GitHub Action; fix CI badge
peterbecich May 15, 2022
b21f35b
Fix #1076: separate validators from UI and doctest them (#1077)
andreasabel May 19, 2022
c2a34d7
Cachix caching for nix-shell GitHub Action (#1081)
peterbecich Jun 4, 2022
c995284
Add uploaded_at field in package api (#1080)
Kleidukos Jun 7, 2022
1248122
package page: Include virtual-modules in module tree (#1085)
mpickering Jun 23, 2022
9dc85e7
Fix analyticsPixel template variable name
alexbiehl Jun 27, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 0 additions & 66 deletions .github/workflows/ci.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci 'github' 'hackage-server.cabal'
#
# To regenerate the script (for example after adjusting tested-with) run
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.14.3.20220416
#
# REGENDATA ("0.14.3.20220416",["github","hackage-server.cabal"])
#
name: Haskell-CI
on:
- push
- pull_request
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-18.04
timeout-minutes:
60
container:
image: buildpack-deps:focal
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.2.2
compilerKind: ghc
compilerVersion: 9.2.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.0.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.10.7
compilerKind: ghc
compilerVersion: 8.10.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.8.4
compilerKind: ghc
compilerVersion: 8.8.4
setup-method: hvr-ppa
allow-failure: false
fail-fast: false
steps:
- name: apt
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
apt-get update
apt-get install -y libbrotli-dev
else
apt-add-repository -y 'ppa:hvr/ghc'
apt-get update
apt-get install -y "$HCNAME" libbrotli-dev
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
fi
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: Set PATH and environment variables
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
if [ "${{ matrix.setup-method }}" = ghcup ]; then
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
else
HC=$HCDIR/bin/$HCKIND
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
fi

HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: env
run: |
env
- name: write cabal config
run: |
mkdir -p $CABAL_DIR
cat >> $CABAL_CONFIG <<EOF
remote-build-reporting: anonymous
write-ghc-environment-files: never
remote-repo-cache: $CABAL_DIR/packages
logs-dir: $CABAL_DIR/logs
world-file: $CABAL_DIR/world
extra-prog-path: $CABAL_DIR/bin
symlink-bindir: $CABAL_DIR/bin
installdir: $CABAL_DIR/bin
build-summary: $CABAL_DIR/logs/build.log
store-dir: $CABAL_DIR/store
install-dirs user
prefix: $CABAL_DIR
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
EOF
cat $CABAL_CONFIG
- name: versions
run: |
$HC --version || true
$HC --print-project-git-commit-id || true
$CABAL --version || true
- name: update cabal index
run: |
$CABAL v2-update -v
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v2
with:
path: source
- name: initial cabal.project for sdist
run: |
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
cat cabal.project
- name: sdist
run: |
mkdir -p sdist
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
- name: unpack
run: |
mkdir -p unpacked
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
- name: generate cabal.project
run: |
PKGDIR_hackage_server="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hackage-server-[0-9.]*')"
echo "PKGDIR_hackage_server=${PKGDIR_hackage_server}" >> "$GITHUB_ENV"
rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_hackage_server}" >> cabal.project
echo "package hackage-server" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|parsec|text)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: cache
uses: actions/cache@v2
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
- name: install dependencies
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
- name: build w/o tests
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: build
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: cabal check
run: |
cd ${PKGDIR_hackage_server} || false
${CABAL} -vnormal check
- name: haddock
run: |
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
- name: unconstrained build
run: |
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
21 changes: 21 additions & 0 deletions .github/workflows/nix-shell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "Test nix-shell"
on:
- push
- pull_request
jobs:
nix-shell:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@v16
with:
nix_path: nixpkgs=channel:nixos-21.11
extra_nix_config: |
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
substituters = https://hydra.iohk.io https://cache.nixos.org/
- uses: cachix/cachix-action@v10
with:
# https://nix.dev/tutorials/continuous-integration-github-actions#setting-up-github-actions
name: hackage-server
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix-shell --pure --run "cabal update && cabal build all --enable-tests"
Loading