Fix actions

harmless-tech · Aug 26, 2023 · 9056f71 · 9056f71
1 parent 06a03fd
commit 9056f71
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 58 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+* text=auto
+
+# Because scripts
+scripts/*.sh text eol=lf
+
+# Because of caching in GitHub Actions
+Cargo.lock text eol=lf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -162,12 +162,6 @@ jobs:
         run: cross test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cross build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ contains(matrix.target, 'x86_64-unknown-linux-') }}
-        run: |
-          target/${{ matrix.target }}/debug/${{ env.bin-name }} just
-          just --version
-          target/${{ matrix.target }}/debug/${{ env.bin-name }} --color just
       - name: Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -217,12 +211,6 @@ jobs:
         run: cargo test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cargo auditable build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ matrix.can-test }}
-        run: |
-          target/${{ matrix.target }}/debug/${{ env.bin-name }} just
-          just --version
-          target/${{ matrix.target }}/debug/${{ env.bin-name }} --color just
       - name: Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -272,11 +260,6 @@ jobs:
         run: cargo test --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cargo auditable build --verbose --workspace --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ matrix.can-test }}
-        run: |
-          target/${{ matrix.target }}/debug/${{ env.bin-name }}.exe just
-          just --version
       - name: Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -70,30 +70,30 @@ jobs:
               popd
             fi
           done
-      - name: Sign archives
-        shell: bash
-        run: |
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          brew install minisign
-          echo -n "$SIGNING_KEY" | base64 --decode > ~/.minisign_secret.key
-          for D in target-*; do
-            if [ -d "${D}" ]; then
-              echo "${D}"
-              pushd "${D}"
-        
-              for file in ./*.tar.gz ./*.zip; do
-                if [ -f "$file" ]; then
-                  minisign -S -s ~/.minisign_secret.key -m $file
-                  minisign -V -p ../keys/cargo-prebuilt.pub -m $file
-                fi 
-              done
-                
-              popd
-            fi
-          done
-          rm -f ~/.minisign_secret.key
-        env:
-          SIGNING_KEY: ${{ secrets.MINISIGN_SIGNING_KEY }}
+#      - name: Sign archives
+#        shell: bash
+#        run: |
+#          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+#          brew install minisign
+#          echo -n "$SIGNING_KEY" | base64 --decode > ~/.minisign_secret.key
+#          for D in target-*; do
+#            if [ -d "${D}" ]; then
+#              echo "${D}"
+#              pushd "${D}"
+#
+#              for file in ./*.tar.gz ./*.zip; do
+#                if [ -f "$file" ]; then
+#                  minisign -S -s ~/.minisign_secret.key -m $file
+#                  minisign -V -p ../keys/dvs.pub -m $file
+#                fi
+#              done
+#
+#              popd
+#            fi
+#          done
+#          rm -f ~/.minisign_secret.key
+#        env:
+#          SIGNING_KEY: ${{ secrets.MINISIGN_SIGNING_KEY }}
       - name: Create and push artifacts to release
         uses: ncipollo/release-action@v1
         with:
@@ -441,11 +441,6 @@ jobs:
         run: cross test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cross build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ contains(matrix.target, 'x86_64-unknown-linux-') }}
-        run: |
-          target/${{ matrix.target }}/release/${{ env.bin-name }} just
-          just --version
       - name: Tar
         run: tar czvf ${{ matrix.target }}.tar.gz -C ./target/${{ matrix.target }}/release ${{ env.bin-name }}${{ matrix.ending }}
       - name: Hash
@@ -495,11 +490,6 @@ jobs:
         run: cargo test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cargo auditable build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ matrix.can-test }}
-        run: |
-          target/${{ matrix.target }}/release/${{ env.bin-name }} just
-          just --version
       - name: Tar
         run: tar czvf ${{ matrix.target }}.tar.gz -C ./target/${{ matrix.target }}/release ${{ env.bin-name }}
       - name: Hash
@@ -549,11 +539,6 @@ jobs:
         run: cargo test --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
       - name: Build
         run: cargo auditable build --verbose --workspace --release --locked --target ${{ matrix.target }} ${{ env.feature-set }}
-      - name: Run cargo-prebuilt
-        if: ${{ matrix.can-test }}
-        run: |
-          target/${{ matrix.target }}/release/${{ env.bin-name }}.exe just
-          just --version
       - name: Zip
         uses: vimtor/action-zip@v1.1
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "dvs"
 version = "0.1.0-dev"
 edition = "2021"
 authors = ["harmless-tech"]
-description = "Create and manage docker systems"
+description = "Create and manage virtual systems using docker"
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/harmless-tech/dvs"

diff --git a/README.md b/README.md
@@ -1 +1,3 @@
-# dvs
+# dvs
+
+Create and manage virtual systems using docker.