Merge pull request #67 from perldoc-jp/revert-66-revert-65-fence

markdownのFencedCodeに対応する

.github/workflows/test.yml

@@ -15,5 +15,5 @@ jobs:
 
     - name: Run test
       run: |
-        make test
+        make ci
 

.github/workflows/update-cpanfile-snapshot.yml

@@ -0,0 +1,41 @@
+name: Update cpanfile.snapshot
+
+on:
+  pull_request:
+    paths:
+      - cpanfile
+      - cpanfile.target
+  workflow_dispatch:
+
+jobs:
+  update-cpanfile-snapshot:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: write
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+
+    - name: Check cpanfile.target
+      id: check-cpanfile-target
+      continue-on-error: true
+      run: sha256sum -c cpanfile.target
+
+    - name: Update cpanfile.snapshot and cpanfile.target
+      if: steps.check-cpanfile-target.outcome == 'failure'
+      run: |
+        docker build . -t perl-app-image --target base
+        docker run --rm -v $(pwd):/usr/src/app perl-app-image bash -c 'carton install'
+        sha256sum cpanfile > cpanfile.target
+
+    - uses: stefanzweifel/[email protected]
+      with:
+        commit_user_name: GitHub Actions
+        commit_user_email: [email protected]
+        commit_message: Update cpanfile.snapshot and cpanfile.target
+        file_pattern: cpanfile.snapshot cpanfile.target cpanfile
+

Dockerfile

@@ -6,27 +6,23 @@ RUN apt-get update && \
   apt-get -y upgrade && \
   apt-get install -y wget gcc g++ make sqlite3
 
-WORKDIR /usr/src/app
+RUN cpm install -g Carton
 
-COPY cpanfile ./
-RUN cpm install
-COPY . .
+WORKDIR /usr/src/app
 
-RUN sqlite3 perldocjp.master.db < sql/sqlite.sql
-RUN cp perldocjp.master.db perldocjp.slave.db
+COPY cpanfile cpanfile.snapshot .
 
 ENV PLACK_ENV=docker
 ENV PERL5LIB=/usr/src/app/local/lib/perl5
 ENV PATH=/usr/src/app/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-# 翻訳データの更新
-RUN perl script/update.pl
 
+FROM base as app
+
+RUN carton install --deployment
+COPY . .
+
+RUN sqlite3 perldocjp.master.db < sql/sqlite.sql
+RUN cp perldocjp.master.db perldocjp.slave.db
 
-# テスト用のステージ
-FROM base as test
-RUN cpm install --with-test --with-develop --show-build-log-on-failure
 
-# サーバーを起動したい時のステージ
-FROM base as web
-CMD ["./local/bin/plackup", "-p", "5000", "-Ilib", "app.psgi"]

Makefile

@@ -1,18 +1,30 @@
 
 .PHONY: build
 build:
-	docker-compose -f docker-compose.yml build web
+	docker compose build
 
 .PHONY: up
 up:
-	make build
-	docker-compose -f docker-compose.yml up -d web
+	docker compose up
 
 .PHONY: down
 down:
-	docker-compose -f docker-compose.yml down
+	docker compose down
 
 .PHONY: test
+test: TEST_TARGET = t
 test:
-	docker-compose -f docker-compose.yml build test
-	docker-compose -f docker-compose.yml run   test prove -Ilib -r -v t
+	docker compose exec app prove -lrv $(TEST_TARGET)
+
+.PHONY: ci
+ci:
+	docker compose up -d
+	make setup-data
+	make test
+
+# 翻訳データのセットアップ
+# TODO: 翻訳データのセットアップは他にもあるので、全部ひとまとめにできると良さそう
+.PHONY: setup-data
+setup-data:
+	docker compose exec app perl script/update.pl
+

cpanfile

@@ -18,7 +18,7 @@ requires 'DBIx::TransactionManager';
 requires 'Regexp::Common';
 requires 'Regexp::Assemble';
 requires 'Text::Diff::FormattedHTML';
-requires 'Text::Markdown';
+requires 'Text::Markdown::Discount';
 requires 'SQL::Interp';
 requires 'Carp::Clan';
 requires 'JSON';
@@ -39,4 +39,5 @@ requires 'Log::Minimal';
 on 'test' => sub {
     requires 'Test2::V0';
     requires 'Test::WWW::Mechanize::PSGI';
+    requires 'Unicode::GCString';
 };