Remove old makefile, dockerfiles (grafana#2130)

sharathfeb12 · Sep 9, 2022 · 556bd25 · 556bd25
1 parent b8ec553
commit 556bd25
Show file tree

Hide file tree

Showing 24 changed files with 427 additions and 1,205 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -84,7 +84,7 @@ steps:
   - name: lint
     image: grafana/agent-build-image:0.15.1
     commands:
-      - make -f Makefile-v2.mk lint
+      - make lint
 
 ---
 kind: pipeline
@@ -115,8 +115,8 @@ steps:
       # The operator tests require K8S_USE_DOCKER_NETWORK=1 to be set when
       # tests are being run inside of a Docker container so it can access the
       # created k3d cluster properly.
-      - make -f Makefile-v2.mk binaries
-      - K8S_USE_DOCKER_NETWORK=1 make -f Makefile-v2.mk test
+      - make binaries
+      - K8S_USE_DOCKER_NETWORK=1 make test
 
 volumes:
  - name: docker
@@ -287,7 +287,7 @@ steps:
         from_secret: gpg_passphrase
     commands:
       - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      - make -f Makefile-v2.mk -j4 RELEASE_BUILD=1 VERISON=${DRONE_TAG} dist
+      - make -j4 RELEASE_BUILD=1 VERISON=${DRONE_TAG} dist
       - RELEASE_DOC_TAG=$(echo $VERSION | awk -F '.' '{print $1"."$2}') ./tools/release
 depends_on:
   - Test
@@ -347,6 +347,6 @@ get:
 
 ---
 kind: signature
-hmac: 051ed54396fad1a1864ec5342b91c3d8599576f985956d8dd42e87e97483a197
+hmac: 30ef74d8b3810aec51486cb913df033ef6b51efa58f85e5cc33a00fa602a0ba7
 
 ...
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,4 +30,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-
     - name: Test
-      run: make DOCKER_OPTS="" GOFLAGS="-tags=netgo,nodocker" BUILD_IN_CONTAINER=false test
+      run: make GO_TAGS="nodocker" test
diff --git a/.github/workflows/test_packages.yml b/.github/workflows/test_packages.yml
@@ -18,5 +18,11 @@ jobs:
       id: go
     - name: Checkout code
       uses: actions/checkout@v3
-    - name: Test
-      run: DOCKER_OPTS="" make test-packages
+    - name: Create build container cache
+      run: make build-container-cache
+    - name: Build agent-linux-amd64
+      run: USE_CONTAINER=1 DOCKER_OPTS="" make dist/agent-linux-amd64
+    - name: Build agentctl-linux-amd64
+      run: USE_CONTAINER=1 DOCKER_OPTS="" make dist/agentctl-linux-amd64
+    - name: Test packages
+      run: USE_CONTAINER=1 DOCKER_OPTS="" make test-packages