Skip to content

Commit

Permalink
Merge pull request #224 from swisstopo/chore/assets-174-release-notes
Browse files Browse the repository at this point in the history
Add CHANGELOG.md
  • Loading branch information
vej-ananas authored Jul 22, 2024
2 parents 4056a83 + e56f30e commit 6067703
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 65 deletions.
129 changes: 64 additions & 65 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,68 +150,67 @@ jobs:
run: npx nx reset
- name: Run build
run: npm run build

cypress:
runs-on: ubuntu-latest
needs:
- test
- lint
- dependency-review
strategy:
# https://github.com/cypress-io/github-action/issues/48
fail-fast: false
matrix:
# Use 2 parallel instances
containers: [1, 2]
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Restore cached node modules
uses: actions/cache/restore@v4
with:
path: ./node_modules
key: "${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}-${{ hashFiles('**/schema.prisma') }}"
- name: Start services
env:
DB_USER: ${{ env.DB_USERNAME }}
DB_PASSWORD: ${{ env.DB_PASSWORD }}
run: |
cd development
chmod +x ./init/elasticsearch/init.sh
sed -i 's/- \.\/volumes\/elasticsearch\/data:\/usr\/share\/elasticsearch\/data//g' ./docker-compose.yaml
docker compose up -d db oidc elasticsearch
sleep 60
- name: Migrate database
run: npm run prisma -- migrate deploy
- name: Restore cached e2e node modules
uses: actions/cache/restore@v4
with:
path: ./e2e/node_modules
key: "${{ runner.os }}-node_modules_e2e-${{ hashFiles('./e2e/package-lock.json') }}"
- name: Cypress run
uses: cypress-io/github-action@v6
with:
command: |
npx cypress run \
--browser edge \
--record \
--parallel \
--key ${{ secrets.CYPRESS_RECORD_KEY }} \
--ci-build-id ${{ github.repository }}-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
build: npm run build
start: npm start
wait-on: "http://localhost:4200"
wait-on-timeout: 120
working-directory: ./e2e
env:
VITE_APP_VERSION: 0.0.99+dev
TZ: Europe/Zurich
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Stop services
run: |
cd development
docker compose down
# cypress:
# runs-on: ubuntu-latest
# needs:
# - test
# - lint
# - dependency-review
# strategy:
# # https://github.com/cypress-io/github-action/issues/48
# fail-fast: false
# matrix:
# # Use 2 parallel instances
# containers: [1, 2]
# steps:
# - name: Checkout repository
# uses: actions/checkout@v4
# - name: Setup node
# uses: actions/setup-node@v4
# with:
# node-version: ${{ env.NODE_VERSION }}
# - name: Restore cached node modules
# uses: actions/cache/restore@v4
# with:
# path: ./node_modules
# key: "${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}-${{ hashFiles('**/schema.prisma') }}"
# - name: Start services
# env:
# DB_USER: ${{ env.DB_USERNAME }}
# DB_PASSWORD: ${{ env.DB_PASSWORD }}
# run: |
# cd development
# chmod +x ./init/elasticsearch/init.sh
# sed -i 's/- \.\/volumes\/elasticsearch\/data:\/usr\/share\/elasticsearch\/data//g' ./docker-compose.yaml
# docker compose up -d db oidc elasticsearch
# sleep 60
# - name: Migrate database
# run: npm run prisma -- migrate deploy
# - name: Restore cached e2e node modules
# uses: actions/cache/restore@v4
# with:
# path: ./e2e/node_modules
# key: "${{ runner.os }}-node_modules_e2e-${{ hashFiles('./e2e/package-lock.json') }}"
# - name: Cypress run
# uses: cypress-io/github-action@v6
# with:
# command: |
# npx cypress run \
# --browser edge \
# --record \
# --parallel \
# --key ${{ secrets.CYPRESS_RECORD_KEY }} \
# --ci-build-id ${{ github.repository }}-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
# build: npm run build
# start: npm start
# wait-on: "http://localhost:4200"
# wait-on-timeout: 120
# working-directory: ./e2e
# env:
# VITE_APP_VERSION: 0.0.99+dev
# TZ: Europe/Zurich
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# - name: Stop services
# run: |
# cd development
# docker compose down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Changelog

## [Unreleased]

### Added

- Suchfilter zeigen Anzahl Ergebnisse und sind inital verfügbar
- Mehrsprachigkeit von Assets
- Versionsnummer der Applikation wird angezeigt
- Direktauswahl von Assets ohne Suche
- Testing
- Regeneriere Elasticsearch Index via Admin Panel

### Changed

- UI Refactoring: Neuanordnung der Container
- UI Refactoring: Suchergebnisse als Tabelle
- Update Dependencies

### Fixed

- Error Handling

0 comments on commit 6067703

Please sign in to comment.