Skip to content
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

Ap 281 #28

Draft
wants to merge 45 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
80ee0c4
before clean up
yzhoubk Apr 9, 2024
a8ad92f
clean up
yzhoubk Apr 9, 2024
8ca08ff
exclud new_user_session
yzhoubk Apr 9, 2024
b429d3e
remove new session path
yzhoubk Apr 9, 2024
9484753
comment out rspec
yzhoubk Apr 10, 2024
fb1019b
rubocop correction
yzhoubk Apr 10, 2024
bbd6c32
setup testing
yzhoubk Apr 15, 2024
69164fb
rm test config
yzhoubk Apr 15, 2024
ee02a3c
setup selenium testing
yzhoubk Apr 15, 2024
8a7133f
with config from TIND-QA
yzhoubk Apr 15, 2024
516e072
Add Configure from TIND-QA
yzhoubk Apr 15, 2024
1a4e03c
add service aliases
yzhoubk Apr 16, 2024
0cdfa13
Updated Chrome settings
danschmidt5189 Apr 16, 2024
7e179ed
Restores shm settings -- headless is sufficient
danschmidt5189 Apr 16, 2024
454f840
install yarn and node.js, setup
yzhoubk Nov 15, 2024
2bcafbf
add javascript entrypoints but not work
yzhoubk Nov 15, 2024
a7ca9e5
test
yzhoubk Nov 18, 2024
4903cb7
rebuilding
yzhoubk Nov 18, 2024
6fc42de
configure local
yzhoubk Nov 19, 2024
3cb0154
vite build segment error
yzhoubk Nov 20, 2024
25db54d
rm log file
yzhoubk Nov 20, 2024
acd8c52
rm .npm
yzhoubk Nov 20, 2024
08a1633
docker and compose file
yzhoubk Nov 21, 2024
e9351c5
update installtion
yzhoubk Nov 26, 2024
d8dcd33
clean up
yzhoubk Nov 26, 2024
adeb895
update artifact action from v3 to v4
yzhoubk Nov 27, 2024
ca2f378
DP-1469: upgrade postgres image to v16.4
yzhoubk Nov 27, 2024
da959f4
Upgrade github actions
yzhoubk Nov 27, 2024
5584e2b
Adding container image and root user in the test job
yzhoubk Dec 3, 2024
6be2c4c
Adding container image and root user in the test job
yzhoubk Dec 3, 2024
0c0b9cf
rm init in test job
yzhoubk Dec 3, 2024
8b5454f
GHA: Run tests with user=root
danschmidt5189 Dec 3, 2024
52a55ef
Allow starting solr as root
danschmidt5189 Dec 3, 2024
f486257
remove: Allow starting solr as root
yzhoubk Dec 5, 2024
0a7e203
matching puma version with rackup version to fix puma issue on runnin…
yzhoubk Dec 5, 2024
dfe054f
update a spec file
yzhoubk Dec 5, 2024
956925d
git ignore yarn folder
yzhoubk Dec 5, 2024
8ec75d6
clr Dockfile
yzhoubk Dec 5, 2024
3becf01
calnet login page test
yzhoubk Dec 6, 2024
f83e023
Update some localize strings
yzhoubk Dec 6, 2024
8787cd5
clr gitignore file
yzhoubk Dec 6, 2024
9eb5bb2
clean up spec test
yzhoubk Dec 9, 2024
0c647b5
1. code merge
yzhoubk Jan 31, 2025
1d4c24c
2. rubocop correction
yzhoubk Jan 31, 2025
80534d4
3. added package clean up in Docker file; clean up Gemfile
yzhoubk Jan 31, 2025
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
81 changes: 81 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
*.rbc
capybara-*.html
.bash*
.rspec
/db/*.sqlite3
/db/*.sqlite3-journal
/db/*.sqlite3-[0-9]*
/public/system
/coverage/
/spec/tmp
*.orig
rerun.txt
pickle-email-*.html

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/master.key

# Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml

# dotenv
# TODO Comment out this rule if environment variables can be committed
.env

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
.byebug_history

# Ignore Bash history file.
.bash_history

# Ignore node_modules
node_modules/

# Ignore precompiled javascript packs
/public/packs
/public/packs-test
/public/assets

# Ignore yarn files
/yarn-error.log
yarn-debug.log*
.yarn-integrity

# Ignore uploaded files in development
/storage/*
!/storage/.keep

# Build/test artifacts
/artifacts/

# Ignore solr files
solr/*/data/*

.irb_history

.github
27 changes: 10 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Build
on: [ push, pull_request, workflow_dispatch ]
env:
REGISTRY: ghcr.io
ACTIONS_STEP_DEBUG: true

jobs:
# TODO: DRY w/release.yml
Expand Down Expand Up @@ -39,10 +40,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -53,7 +54,7 @@ jobs:
echo BUILD_TIMESTAMP="$(date --utc --iso-8601=seconds)" >> $GITHUB_ENV

- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand All @@ -76,7 +77,7 @@ jobs:
runs-on: ubuntu-latest

container:
options: --init
options: --user=root
image: ${{ needs.build.outputs.build_image }}

defaults:
Expand All @@ -85,19 +86,11 @@ jobs:

services:
db:
image: postgres
image: postgres:16.4
env:
POSTGRES_USER: root
POSTGRES_PASSWORD: root

# solr:
# image: solr:8
# #restart: always
# ports:
# - 8983:8983
# volumes:
# - ${{ github.workspace }}/solr:/var/solr/data/configsets/solr:delegated

steps:
- name: Run tests
env:
Expand All @@ -106,7 +99,7 @@ jobs:

- name: Run style checks
run: bundle exec rubocop

- name: Validate database migrations
env:
RAILS_ENV: test
Expand All @@ -115,13 +108,13 @@ jobs:

- name: Upload artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
path: |
/opt/app/artifacts/**
/tmp/solr*/server/logs


# TODO: DRY w/release.yml
push:
Expand All @@ -145,7 +138,7 @@ jobs:
images: ${{ env.BASE_IMAGE_NAME }}

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Docker CI

on:
push:
release:
workflow_dispatch:

jobs:
build:
uses: BerkeleyLibrary/.github/.github/workflows/[email protected]

test:
needs: build
uses: BerkeleyLibrary/.github/.github/workflows/[email protected]
69 changes: 0 additions & 69 deletions .github/workflows/release.yml

This file was deleted.

50 changes: 18 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
*.rbc
capybara-*.html
.bash*
.rspec
/db/*.sqlite3
/db/*.sqlite3-journal
/db/*.sqlite3-[0-9]*
/public/system
/coverage/
/spec/tmp
*.orig
rerun.txt
pickle-email-*.html

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
Expand All @@ -29,29 +15,21 @@ config/master.key
# TODO Comment out this rule if environment variables can be committed
.env

.bash*

## Environment normalization:
/.bundle
/vendor/bundle

/.local
/.webdrivers
/.cache
# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
# Ignore command history file.
.byebug_history
.irb_history

# Ignore Bash history file.
.bash_history

# Ignore node_modules
node_modules/
Expand All @@ -63,15 +41,23 @@ node_modules/

# Ignore yarn files
/yarn-error.log
/.yarnrc
yarn-debug.log*
yarn.lock
.yarn
.yarn-integrity

# Ignore uploaded files in development
/storage/*
!/storage/.keep
# Ignore .npm files
/.npm

# Build/test artifacts
/artifacts/

# Ignore solr files
solr/*/data/*

# Vite Ruby
/public/vite*
# Vite uses dotenv and suggests to ignore local-only env files. See
# https://vitejs.dev/guide/env-and-mode.html#env-files
*.local
Loading
Loading