Skip to content

Commit

Permalink
Trigger CI nodejs@18
Browse files Browse the repository at this point in the history
  • Loading branch information
Dhwaniartefact committed Nov 22, 2023
1 parent 155f229 commit 9efb375
Show file tree
Hide file tree
Showing 10 changed files with 3,635 additions and 7,519 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/acceptance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
name: "Acceptance Test"
on:
pull_request:
types: [labeled]
push:
branches:
- "dev/issue-update-frontend-deps-take-three"
jobs:
test:
if: github.event.label.name == 'AMAUAT'
name: "Test ${{ matrix.tag }} on ${{ matrix.browser }}"
runs-on: "ubuntu-22.04"
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- "qa/**"
- "stable/**"
- "dev/issue-update-frontend-deps-take-three"
jobs:
test:
name: "Test ${{ matrix.rule }} on ${{ matrix.python-version }}"
Expand Down
19 changes: 7 additions & 12 deletions hack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,18 @@ RUN set -ex \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy multiverse" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-security universe" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-updates multiverse" \
&& curl -sS https://deb.nodesource.com/setup_18.x | bash - \
&& curl -so /tmp/repo-mediaarea_1.0-21_all.deb -L https://mediaarea.net/repo/deb/repo-mediaarea_1.0-21_all.deb \
&& dpkg -i /tmp/repo-mediaarea_1.0-21_all.deb \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libyaml-dev clamav \
libyaml-dev clamav nodejs \
&& /src/hack/osdeps.py Ubuntu-22 1 | grep -v -E "nginx|postfix|python3.9-dev" | xargs apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

# Download ClamAV virus signatures
RUN freshclam --quiet

# Install pip, Node.js and Yarn
RUN set -ex \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& add-apt-repository --yes "deb https://dl.yarnpkg.com/debian/ stable main" \
&& apt-get install -y --no-install-recommends \
yarn nodejs \
&& rm -rf /var/lib/apt/lists/*

ENV PYENV_ROOT="/pyenv/data"
ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH

Expand Down Expand Up @@ -145,8 +138,10 @@ RUN set -ex \

USER archivematica

RUN set -ex \
&& yarn --cwd=/src/src/dashboard/frontend install --frozen-lockfile
WORKDIR /src/src/dashboard/frontend

RUN set ex \
&& npm install --no-package-lock

WORKDIR /src/src/dashboard/src

Expand Down Expand Up @@ -197,7 +192,7 @@ USER archivematica

WORKDIR /src/src/dashboard/frontend

ENTRYPOINT ["yarn", "run", "test-single-run"]
ENTRYPOINT ["npm", "run", "test-single-run"]

# -----------------------------------------------------------------------------

Expand Down
13 changes: 7 additions & 6 deletions hack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,14 @@ bootstrap-dashboard-db: ## Bootstrap Dashboard (new database).

bootstrap-dashboard-frontend: ## Build front-end assets.
docker compose run \
-e HOME=/tmp/yarn-config \
--workdir /src/src/dashboard/frontend \
-e HOME=/tmp/npm-config \
--rm \
--no-deps \
--user $(CALLER_UID):$(CALLER_GID) \
--entrypoint yarn \
--entrypoint npm \
archivematica-dashboard \
--cwd=/src/src/dashboard/frontend install --frozen-lockfile
install --no-package-lock

restart-am-services: ## Restart Archivematica services: MCPServer, MCPClient, Dashboard and Storage Service.
docker compose restart --no-deps archivematica-mcp-server
Expand Down Expand Up @@ -385,13 +386,13 @@ test-frontend: ## Run Dashboard JS tests.
--build-arg TARGET=archivematica-dashboard-testing \
../
docker run \
-e HOME=/tmp/yarn-config \
-e HOME=/tmp/npm-config \
--rm \
--user $(CALLER_UID):$(CALLER_GID) \
--volume "$(SRCDIR)/dashboard:/src/src/dashboard" \
--entrypoint yarn \
--entrypoint npm \
archivematica-dashboard-testing \
--cwd=/src/src/dashboard/frontend install --frozen-lockfile
install
docker run \
--rm \
--volume "$(SRCDIR)/dashboard/frontend:/src/src/dashboard/frontend" \
Expand Down
Loading

0 comments on commit 9efb375

Please sign in to comment.