Merge branch 'master' into create-pull-request/patch

Author: kishikawakatsumi

.github/workflows/spm.yml

@@ -19,10 +19,14 @@ jobs:
       - name: Update Swift Package
         run: |
           set -ex
+
           export TOOLCHAINS=swift
+
           swift package update --package-path ./
-          swift package update --package-path Resources/branch_main
-          swift package update --package-path Resources/branch_release-5.9
+
+          swift package update --package-path Resources/parsers/50800
+          swift package update --package-path Resources/parsers/50900
+          swift package update --package-path Resources/parsers/trunk
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v5

.github/workflows/test.yml

@@ -15,10 +15,24 @@ jobs:
       - name: Test
         run: |
           set -ex
+
           swift test
-          (cd Resources/branch_release-5.9 && swift test)
-          (cd Resources/branch_main && swift test)
-      - name: Build
+
+          (cd Resources/parsers/50800 && swift test)
+          (cd Resources/parsers/50900 && swift test)
+          (cd Resources/parsers/trunk && swift test)
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
         run: |
           set -ex
-          docker build --rm --no-cache --build-arg FONTAWESOME_TOKEN=${{ env.FONTAWESOME_TOKEN }} .
+
+          IMAGE_TAG=kishikawakatsumi/swift-ast-explorer.com:latest
+
+          docker build --rm --no-cache --build-arg FONTAWESOME_TOKEN=${{ env.FONTAWESOME_TOKEN }} --tag ${IMAGE_TAG} .
+          docker push ${IMAGE_TAG}

Dockerfile

@@ -13,7 +13,7 @@ COPY Public ./Public/
 RUN npx webpack --config webpack.prod.js
 
 
-FROM swift:5.8-focal as swift
+FROM swift:5.8-jammy as swift
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
     && apt-get -q update \
     && apt-get -q dist-upgrade -y\
@@ -27,8 +27,9 @@ RUN swift package resolve
 COPY . .
 RUN swift build -c release --static-swift-stdlib
 
-RUN cd Resources/branch_release-5.9 && swift build -c debug --static-swift-stdlib
-RUN cd Resources/branch_main && swift build -c debug --static-swift-stdlib
+RUN cd Resources/parsers/50800 && swift build -c release --static-swift-stdlib
+RUN cd Resources/parsers/50900 && swift build -c release --static-swift-stdlib
+RUN cd Resources/parsers/trunk && swift build -c release --static-swift-stdlib
 
 WORKDIR /staging
 
@@ -40,7 +41,7 @@ RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public
 RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
 
 
-FROM swift:5.8-focal
+FROM ubuntu:jammy
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
     && apt-get -q update \
     && apt-get -q dist-upgrade -y \

Package.resolved

@@ -7,21 +7,17 @@ let package = Package(
     .macOS(.v13)
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
-    .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.5.2"),
     .package(url: "https://github.com/vapor/vapor.git", from: "4.78.0"),
     .package(url: "https://github.com/vapor/leaf.git", from: "4.2.4"),
+    .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.5.2"),
   ],
   targets: [
     .executableTarget(
       name: "App",
       dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftOperators", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "TSCBasic", package: "swift-tools-support-core"),
         .product(name: "Vapor", package: "vapor"),
         .product(name: "Leaf", package: "leaf"),
+        .product(name: "TSCBasic", package: "swift-tools-support-core"),
       ],
       swiftSettings: [
         .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
@@ -32,8 +28,7 @@ let package = Package(
       dependencies: [
         .target(name: "App"),
         .product(name: "XCTVapor", package: "vapor"),
-      ],
-      resources: [.process("Fixtures")]
+      ]
     )
   ]
 )

Package.swift

@@ -129,17 +129,17 @@
               <li>
                 <h6 class="dropdown-header">Swift Syntax Version</h6>
               </li>
-              <li class="options-item radio parser-version active-tick" data-value="branch_stable" data-text="508.0.1">
+              <li class="options-item radio parser-version active-tick" data-value="50800" data-text="508.0.1">
                 <a class="dropdown-item" data-target="#">
                   508.0.1 (Swift 5.8)
                 </a>
               </li>
-              <li class="options-item radio parser-version" data-value="branch_release-5.9" data-text="release/5.9">
+              <li class="options-item radio parser-version" data-value="50900" data-text="release/5.9">
                 <a class="dropdown-item" data-target="#">
                   release/5.9 branch
                 </a>
               </li>
-              <li class="options-item radio parser-version" data-value="branch_main" data-text="main">
+              <li class="options-item radio parser-version" data-value="trunk" data-text="main">
                 <a class="dropdown-item" data-target="#">
                   main branch
                 </a>
@@ -175,7 +175,7 @@ <h6 class="dropdown-header">Swift Syntax Version</h6>
     </header>
     <main class="flex-grow-1 row row-cols-2 g-0 h-100">
       <div class="col">
-        <textarea id="editor-container" class="h-100 d-none">#(defaultSampleCode)</textarea>
+        <textarea id="editor-container" class="h-100 d-none">#(code)</textarea>
       </div>
       <div class="col">
         <div class="tab-content">

Public/index.html

@@ -266,7 +266,7 @@ export class App {
 }
 
 function branchOptions() {
-  let branch = "branch_stable";
+  let branch = "50800";
   document
     .querySelectorAll(".options-item.radio.parser-version")
     .forEach((listItem) => {