Browse Source

ci: change rust src to crates-io-index while using GitHub workflow (#1023)

Signed-off-by: longjin <[email protected]>
LoGin 4 months ago
parent
commit
7b0ef10895
3 changed files with 25 additions and 9 deletions
  1. 8 8
      .github/workflows/makefile.yml
  2. 1 1
      tools/BUILD_CONTAINER_VERSION
  3. 16 0
      tools/docker-entrypoint.sh

+ 8 - 8
.github/workflows/makefile.yml

@@ -12,14 +12,14 @@ jobs:
     name: Format check ${{ matrix.arch }}
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: dragonos/dragonos-dev:v1.4
+    container: dragonos/dragonos-dev:v1.5
 
     strategy:
       matrix:
         arch: [x86_64, riscv64]
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.4"
+    - run: echo "Running in dragonos/dragonos-dev:v1.5"
     - uses: actions/checkout@v3
 
     - name: Format check
@@ -35,14 +35,14 @@ jobs:
     name: Kernel static test ${{ matrix.arch }}
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: dragonos/dragonos-dev:v1.4
+    container: dragonos/dragonos-dev:v1.5
 
     strategy:
       matrix:
         arch: [x86_64, riscv64]
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.4"
+    - run: echo "Running in dragonos/dragonos-dev:v1.5"
 
     - uses: actions/checkout@v3
 
@@ -56,10 +56,10 @@ jobs:
   build-x86_64:
 
     runs-on: ubuntu-latest
-    container: dragonos/dragonos-dev:v1.4
+    container: dragonos/dragonos-dev:v1.5
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.4"
+    - run: echo "Running in dragonos/dragonos-dev:v1.5"
 
     - uses: actions/checkout@v3
     - name: build the DragonOS
@@ -78,10 +78,10 @@ jobs:
   build-riscv64:
 
     runs-on: ubuntu-latest
-    container: dragonos/dragonos-dev:v1.4
+    container: dragonos/dragonos-dev:v1.5
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.4"
+    - run: echo "Running in dragonos/dragonos-dev:v1.5"
 
     - uses: actions/checkout@v3
       with:

+ 1 - 1
tools/BUILD_CONTAINER_VERSION

@@ -1 +1 @@
-v1.4
+v1.5

+ 16 - 0
tools/docker-entrypoint.sh

@@ -1,3 +1,19 @@
 #!/bin/bash
 
+CONFIG_FILE=~/.cargo/config.toml
+
+change_rust_src_to_official() {
+echo -e "[source.crates-io]                             \n \
+registry = \"sparse+https://index.crates.io/\"            \n \
+[net]                                                   \n \
+git-fetch-with-cli = true                               \n \
+" > $CONFIG_FILE
+}
+
+# Check if the GITHUB_WORKFLOW environment variable is set and not empty
+if [ -n "$GITHUB_ACTION" ]; then
+    change_rust_src_to_official
+fi
+
+
 exec "$@"