Ubuntu 24.04 対応しつつ run.py に切り替える

melpon · Oct 19, 2024 · b132eba · b132eba
1 parent a898d2d
commit b132eba
Show file tree

Hide file tree

Showing 12 changed files with 2,439 additions and 86 deletions.
diff --git a/.github/workflows/deploy-develop.yml b/.github/workflows/deploy-develop.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Register SSH key
       env:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -19,11 +19,11 @@ jobs:
         chmod 600 $HOME/.ssh/id_ed25519
     - name: Add SSH config
       env:
-        SSH_HOST: ${{ secrets.SSH_HOST }}
+        SSH_HOST: ${{ secrets.SSH_HOST_UBUNTU_24_04 }}
         SSH_USER: ${{ secrets.SSH_USER }}
       run: |
         set -ex
-        echo "Host wandbox" >> $HOME/.ssh/config
+        echo "Host wandbox-ubuntu-24.04" >> $HOME/.ssh/config
         echo "    HostName $SSH_HOST" >> $HOME/.ssh/config
         echo "    User $SSH_USER" >> $HOME/.ssh/config
         echo "    ServerAliveInterval 60" >> $HOME/.ssh/config
@@ -33,31 +33,27 @@ jobs:
       run: sudo apt-get install -y libcap-dev
     - name: Get cached tools
       id: cache-tools
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: _install
-        key: install-deps-v2
-    - name: Install deps
-      run: ./install_deps.sh --release
+        key: install-deps-v3
     - name: Package cattleshed
-      run: |
-        ./package.sh cattleshed develop
+      run: python3 run.py package --env develop cattleshed
     - name: Package kennel
-      run: |
-        ./package.sh kennel develop
-    - name: Deploy cattleshed to develop.wandbox.org
-      run: |
-        ./deploy.sh wandbox cattleshed develop
-    - name: Deploy kennel to develop.wandbox.org
-      run: |
-        ./deploy.sh wandbox kennel develop
+      run: python3 run.py package --env develop kennel
+    # - name: Deploy cattleshed to develop.wandbox.org
+    #   run: |
+    #     ./deploy.sh wandbox-ubuntu-24.04 cattleshed master
+    # - name: Deploy kennel to develop.wandbox.org
+    #   run: |
+    #     ./deploy.sh wandbox-ubuntu-24.04 kennel master
     - uses: actions/setup-node@v2
       with:
         node-version: '16'
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
-        cache-name: cache-node-modules-v1
+        cache-name: cache-node-modules-v2
       with:
         path: ~/.npm
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('canine/package-lock.json') }}
@@ -71,11 +67,11 @@ jobs:
         set -ex
         npm install
         npm run build
-    - name: Publish canine
-      working-directory: canine
-      env:
-        CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-      run: |
-        set -ex
-        npm install -g @cloudflare/wrangler
-        npm run deploy:dev
+    # - name: Publish canine
+    #   working-directory: canine
+    #   env:
+    #     CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+    #   run: |
+    #     set -ex
+    #     npm install -g @cloudflare/wrangler
+    #     npm run deploy:dev
diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Register SSH key
       env:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -19,11 +19,11 @@ jobs:
         chmod 600 $HOME/.ssh/id_ed25519
     - name: Add SSH config
       env:
-        SSH_HOST: ${{ secrets.SSH_HOST }}
+        SSH_HOST: ${{ secrets.SSH_HOST_UBUNTU_24_04 }}
         SSH_USER: ${{ secrets.SSH_USER }}
       run: |
         set -ex
-        echo "Host wandbox" >> $HOME/.ssh/config
+        echo "Host wandbox-ubuntu-24.04" >> $HOME/.ssh/config
         echo "    HostName $SSH_HOST" >> $HOME/.ssh/config
         echo "    User $SSH_USER" >> $HOME/.ssh/config
         echo "    ServerAliveInterval 60" >> $HOME/.ssh/config
@@ -33,31 +33,27 @@ jobs:
       run: sudo apt-get install -y libcap-dev
     - name: Get cached tools
       id: cache-tools
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: _install
-        key: install-deps-v2
-    - name: Install deps
-      run: ./install_deps.sh --release
+        key: install-deps-v3
     - name: Package cattleshed
-      run: |
-        ./package.sh cattleshed master
+      run: python3 run.py package --env master cattleshed
     - name: Package kennel
-      run: |
-        ./package.sh kennel master
-    - name: Deploy cattleshed to wandbox.org
-      run: |
-        ./deploy.sh wandbox cattleshed master
-    - name: Deploy kennel to wandbox.org
-      run: |
-        ./deploy.sh wandbox kennel master
+      run: python3 run.py package --env master kennel
+    # - name: Deploy cattleshed to wandbox.org
+    #   run: |
+    #     ./deploy.sh wandbox-ubuntu-24.04 cattleshed master
+    # - name: Deploy kennel to wandbox.org
+    #   run: |
+    #     ./deploy.sh wandbox-ubuntu-24.04 kennel master
     - uses: actions/setup-node@v2
       with:
         node-version: '16'
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
-        cache-name: cache-node-modules-v1
+        cache-name: cache-node-modules-v2
       with:
         path: ~/.npm
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('canine/package-lock.json') }}
@@ -71,11 +67,11 @@ jobs:
         set -ex
         npm install
         npm run build
-    - name: Publish canine
-      working-directory: canine
-      env:
-        CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-      run: |
-        set -ex
-        npm install -g @cloudflare/wrangler
-        npm run deploy:prod
+    # - name: Publish canine
+    #   working-directory: canine
+    #   env:
+    #     CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+    #   run: |
+    #     set -ex
+    #     npm install -g @cloudflare/wrangler
+    #     npm run deploy:prod
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,16 @@
 {
+  "python.analysis.autoImportCompletions": true,
+  "python.analysis.typeCheckingMode": "basic",
+  "[python]": {
+    "editor.formatOnSave": true,
+    "editor.formatOnSaveMode": "file",
+    "editor.defaultFormatter": "charliermarsh.ruff",
+    "editor.autoIndent": "full",
+    "editor.codeActionsOnSave": {
+      "source.fixAll.ruff": "always",
+      "source.organizeImports.ruff": "explicit"
+    }
+  },
   "[javascript]": {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"

diff --git a/VERSION b/VERSION
@@ -0,0 +1,11 @@
+WANDBOX_VERSION=0.1.0
+CMAKE_VERSION=3.29.4
+GRPC_VERSION=v1.64.1
+GGRPC_VERSION=0.5.8
+SPDLOG_VERSION=v1.14.1
+BOOST_VERSION=1.86.0
+CLI11_VERSION=v2.4.2
+PROTOC_GEN_JSONIF_VERSION=0.13.0
+SQLITE3_VERSION=3.46.1
+SQLITE3_YEAR=2024
+CPPDB_VERSION=v0.3.1