From 71f6f3a95853dfe9c99a51a7726a001ec10ad9de Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 11 Mar 2022 12:41:45 -0800 Subject: [PATCH] test: Fix universe tests - Remove universe.dagger.io/cue.mod from `.gitignore` - Re-add symlink - Remove test-docs.yml workflow Signed-off-by: Andrea Luzzardi --- .github/workflows/test-docs.yml | 83 -------------------- pkg/universe.dagger.io/.gitignore | 1 - pkg/universe.dagger.io/cue.mod/pkg/dagger.io | 1 + 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 .github/workflows/test-docs.yml create mode 120000 pkg/universe.dagger.io/cue.mod/pkg/dagger.io diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml deleted file mode 100644 index 6622e770..00000000 --- a/.github/workflows/test-docs.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: "Test Docs" - -on: - push: - branches: [main] - paths: - - '**.go' - - '**.cue' - - 'docs/**' - - 'Makefile' - - '.github/workflows/test-docs.yml' - pull_request: - branches: [main] - paths: - - '**.go' - - '**.cue' - - 'docs/**' - - 'Makefile' - - '.github/workflows/test-docs.yml' - -# jobs: -# test-docs: -# name: "Test Docs" -# runs-on: ubuntu-latest -# timeout-minutes: 15 -# steps: -# - name: "Check out" -# uses: actions/checkout@v2 - -# - name: "Setup Go" -# uses: actions/setup-go@v1 -# with: -# go-version: 1.16 - -# - name: "Install CUE" -# run: | -# # Cue -# export CUE_VERSION="$(grep cue ./go.mod | cut -d' ' -f2 | head -1 | sed -E 's/\.[[:digit:]]\.[[:alnum:]]+-[[:alnum:]]+$//')" -# export CUE_TARBALL="cue_${CUE_VERSION}_linux_amd64.tar.gz" -# echo "Installing cue version $CUE_VERSION" -# curl -L https://github.com/cue-lang/cue/releases/download/${CUE_VERSION}/${CUE_TARBALL} | sudo tar zxf - -C /usr/local/bin - -# - name: "Run local registry" -# run: | -# docker run -d -p 5000:5000 --name registry registry:2 - -# # TODO: DISABLED for CI deadlock debugging -# # - name: Generate KiND config -# # run: | -# # echo 'kind: Cluster -# # apiVersion: kind.x-k8s.io/v1alpha4 -# # containerdConfigPatches: -# # - |- -# # [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:5000"] -# # endpoint = ["http://registry:5000"]' > ./kind-config.yaml -# # cat ./kind-config.yaml - -# # - name: "Setup KiND" -# # uses: helm/kind-action@v1.2.0 -# # with: -# # config: "./kind-config.yaml" - -# # - name: Connect local registry to KiND -# # run: | -# # docker network connect kind registry - -# - name: "Import Dagger private key" -# env: -# DAGGER_AGE_KEY: ${{ secrets.DAGGER_AGE_KEY }} -# run: | -# mkdir -p ~/.config/dagger -# echo "$DAGGER_AGE_KEY" > ~/.config/dagger/keys.txt - -# - name: "Expose GitHub Runtime" -# uses: crazy-max/ghaction-github-runtime@v1 - -# - name: Test -# # TODO: https://github.com/dagger/dagger/pull/1341 -# # env: -# # DAGGER_CACHE_TO: "type=gha,mode=max,scope=test-docs" -# # DAGGER_CACHE_FROM: "type=gha,mode=max,scope=test-docs" -# run: | -# make doc-test diff --git a/pkg/universe.dagger.io/.gitignore b/pkg/universe.dagger.io/.gitignore index b059c2d4..ff8f4176 100644 --- a/pkg/universe.dagger.io/.gitignore +++ b/pkg/universe.dagger.io/.gitignore @@ -1,3 +1,2 @@ node_modules report.xml -cue.mod diff --git a/pkg/universe.dagger.io/cue.mod/pkg/dagger.io b/pkg/universe.dagger.io/cue.mod/pkg/dagger.io new file mode 120000 index 00000000..cb095939 --- /dev/null +++ b/pkg/universe.dagger.io/cue.mod/pkg/dagger.io @@ -0,0 +1 @@ +../../../dagger.io \ No newline at end of file